Skip to content

Commit 9d2eb9f

Browse files
committed
Clean up @vectorize_(1|2)arg deprecations.
1 parent a578032 commit 9d2eb9f

File tree

1 file changed

+19
-8
lines changed

1 file changed

+19
-8
lines changed

base/deprecated.jl

+19-8
Original file line numberDiff line numberDiff line change
@@ -795,8 +795,6 @@ end
795795
macro dep_vectorize_2arg(S, f)
796796
S = esc(S)
797797
f = esc(f)
798-
T1 = esc(:T1)
799-
T2 = esc(:T2)
800798
quote
801799
@deprecate $f{T1<:$S,T2<:$S}(x::T1, y::AbstractArray{T2}) $f.(x,y)
802800
@deprecate $f{T1<:$S,T2<:$S}(x::AbstractArray{T1}, y::T2) $f.(x,y)
@@ -810,10 +808,17 @@ for f in (
810808
:log, :log1p, # base/special/log.jl
811809
:gamma, :lfact, :digamma, :trigamma, :zeta, :eta,# base/special/gamma.jl
812810
:erfcx, :erfi, :dawson, # base/special/erf.jl
813-
:airyprime, :airyai, :airyaiprime, :airybi, :airybiprime, :airy, :airyx, :besselj0, :besselj1, :bessely0, :bessely1, # base/special/bessel.jl
814-
:cbrt, :sinh, :cosh, :tanh, :atan, :asinh, :exp, :erf, :erfc, :exp2, :expm1, :exp10, :sin, :cos, :tan, :asin, :acos, :acosh, :atanh, #=:log,=# :log2, :log10, :lgamma, #=:log1p,=# :sqrt, # base/math.jl
811+
:airyprime, :airyai, :airyaiprime, :airybi, :airybiprime, # base/special/bessel.jl
812+
:airy, :airyx, :besselj0, :besselj1, :bessely0, :bessely1, # base/special/bessel.jl
813+
:cbrt, :sinh, :cosh, :tanh, :atan, :asinh, :exp, :erf, :erfc, :exp2, # base/math.jl
814+
:expm1, :exp10, :sin, :cos, :tan, :asin, :acos, :acosh, :atanh, # base/math.jl
815+
#=:log,=# :log2, :log10, :lgamma, #=:log1p,=# :sqrt, # base/math.jl
815816
:abs, :abs2, :angle, :isnan, :isinf, :isfinite, # base/floatfuncs.jl
816-
:acos_fast, :acosh_fast, :angle_fast, :asin_fast, :asinh_fast, :atan_fast, :atanh_fast, :cbrt_fast, :cis_fast, :cos_fast, :cosh_fast, :exp10_fast, :exp2_fast, :exp_fast, :expm1_fast, :lgamma_fast, :log10_fast, :log1p_fast, :log2_fast, :log_fast, :sin_fast, :sinh_fast, :sqrt_fast, :tan_fast, :tanh_fast, # base/fastmath.jl
817+
:acos_fast, :acosh_fast, :angle_fast, :asin_fast, :asinh_fast, # base/fastmath.jl
818+
:atan_fast, :atanh_fast, :cbrt_fast, :cis_fast, :cos_fast, # base/fastmath.jl
819+
:cosh_fast, :exp10_fast, :exp2_fast, :exp_fast, :expm1_fast, # base/fastmath.jl
820+
:lgamma_fast, :log10_fast, :log1p_fast, :log2_fast, :log_fast, # base/fastmath.jl
821+
:sin_fast, :sinh_fast, :sqrt_fast, :tan_fast, :tanh_fast, # base/fastmath.jl
817822
:cis, # base/complex.jl
818823
)
819824
@eval @dep_vectorize_1arg Number $f
@@ -833,8 +838,12 @@ end
833838
@dep_vectorize_1arg Complex float
834839
for f in (
835840
:year, :month, :day, :week, :dayofmonth, :yearmonth, :monthday, :yearmonthday, # base/dates/accessors.jl
836-
:firstdayofweek, :lastdayofweek, :firstdayofmonth, :lastdayofmonth, :firstdayofyear, :lastdayofyear, :firstdayofquarter, :lastdayofquarter, # base/dates/adjusters.jl
837-
:dayname, :dayabbr, :dayofweek, :dayofweekofmonth, :daysofweekinmonth, :monthname, :monthabbr, :daysinmonth, :isleapyear, :dayofyear, :daysinyear, :quarterofyear, :dayofquarter, # base/dates/query.jl
841+
:firstdayofweek, :lastdayofweek, :firstdayofmonth, # base/dates/adjusters.jl
842+
:lastdayofmonth, :firstdayofyear, :lastdayofyear, # base/dates/adjusters.jl
843+
:firstdayofquarter, :lastdayofquarter, # base/dates/adjusters.jl
844+
:dayname, :dayabbr, :dayofweek, :dayofweekofmonth, # base/dates/query.jl
845+
:daysofweekinmonth, :monthname, :monthabbr, :daysinmonth, # base/dates/query.jl
846+
:isleapyear, :dayofyear, :daysinyear, :quarterofyear, :dayofquarter, # base/dates/query.jl
838847
)
839848
@eval @dep_vectorize_1arg Dates.TimeType $f
840849
end
@@ -849,7 +858,9 @@ end
849858
# Deprecate @vectorize_2arg-vectorized functions from...
850859
for f in (
851860
:polygamma, :zeta, :beta, :lbeta, # base/special/gamma.jl
852-
:airy, :airyx, :besseli, :besselix, :besselj, :besseljx, :besselk, :besselkx, :bessely, :besselyx, :besselh, :besselhx, :hankelh1, :hankelh2, :hankelh1x, :hankelh2x, # base/special/bessel.jl
861+
:airy, :airyx, :besseli, :besselix, :besselj, :besseljx, # base/special/bessel.jl
862+
:besselk, :besselkx, :bessely, :besselyx, :besselh, # base/special/bessel.jl
863+
:besselhx, :hankelh1, :hankelh2, :hankelh1x, :hankelh2x, # base/special/bessel.jl
853864
:log, :hypot, :atan2, # base/math.jl
854865
:pow_fast, :atan2_fast, :hypot_fast, :max_fast, :min_fast, :minmax_fast, # base/fastmath.jl
855866
)

0 commit comments

Comments
 (0)