Skip to content

Commit 5d8692e

Browse files
committed
deprecate constructors with type as first argument
1 parent 9058120 commit 5d8692e

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ like Fortran.
88
```julia
99
julia> using OffsetArrays
1010

11-
julia> y = OffsetArray(Float64, -1:1, -7:7, -128:512, -5:5, -1:1, -3:3, -2:2, -1:1);
11+
julia> y = OffsetArray{Float64}(-1:1, -7:7, -128:512, -5:5, -1:1, -3:3, -2:2, -1:1);
1212

1313
julia> summary(y)
1414
"OffsetArrays.OffsetArray{Float64,8,Array{Float64,8}} with indices -1:1×-7:7×-128:512×-5:5×-1:1×-3:3×-2:2×-1:1"
@@ -117,11 +117,11 @@ Only the 2nd timing after warming up is given.
117117
Added
118118
+ examples/scalar_law/PROGRAM1/...
119119
```sh
120-
[~/w/m/O/e/s/PROGRAM1] $ julia linaddmain.jl --cells=10000 --runs=3 ms master|✚ 1…
120+
[~/w/m/O/e/s/PROGRAM1] $ julia linaddmain.jl --cells=10000 --runs=3 ms master|✚ 1…
121121
0.672295 seconds (42.90 k allocations: 1.990 MB)
122122
0.509693 seconds (18 allocations: 313.281 KB)
123123
0.512243 seconds (18 allocations: 313.281 KB)
124-
[~/w/m/O/e/s/PROGRAM1] $ julia linaddmain.jl --cells=100000 --runs=3 6134ms master|✚ 1…
124+
[~/w/m/O/e/s/PROGRAM1] $ julia linaddmain.jl --cells=100000 --runs=3 6134ms master|✚ 1…
125125
7.270463 seconds (42.90 k allocations: 4.736 MB)
126126
7.177485 seconds (18 allocations: 3.053 MB)
127127
7.248687 seconds (18 allocations: 3.053 MB)

src/OffsetArrays.jl

+4-2
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,15 @@ OffsetArray{T}(inds::Indices{N}) where {T,N} = OffsetArray{T,N}(inds)
3232
OffsetArray{T,N}(inds::Vararg{AbstractUnitRange,N}) where {T,N} = OffsetArray{T,N}(inds)
3333
OffsetArray{T}(inds::Vararg{AbstractUnitRange,N}) where {T,N} = OffsetArray{T,N}(inds)
3434
OffsetArray(A::AbstractArray{T,0}) where {T} = OffsetArray{T,0,typeof(A)}(A, ())
35-
OffsetArray(::Type{T}, inds::Vararg{UnitRange{Int},N}) where {T,N} = OffsetArray{T,N}(inds)
3635

3736
# OffsetVector constructors
3837
OffsetVector(A::AbstractVector, offset) = OffsetArray(A, offset)
39-
OffsetVector(::Type{T}, inds::AbstractUnitRange) where {T} = OffsetArray{T,1}(inds)
4038
OffsetVector{T}(inds::AbstractUnitRange) where {T} = OffsetArray{T}(inds)
4139

40+
# https://github.com/JuliaLang/julia/pull/19989
41+
@deprecate OffsetArray(::Type{T}, inds::Vararg{UnitRange{Int},N}) where {T,N} OffsetArray{T}(inds)
42+
@deprecate OffsetVector(::Type{T}, inds::AbstractUnitRange) where {T} OffsetArray{T}(inds)
43+
4244
# The next two are necessary for ambiguity resolution. Really, the
4345
# second method should not be necessary.
4446
OffsetArray(A::AbstractArray{T,0}, inds::Tuple{}) where {T} = OffsetArray{T,0,typeof(A)}(A, ())

test/runtests.jl

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ using OffsetArrays
66
# Basics
77
for n = 0:5
88
for a in (OffsetArray(ones(Int,ntuple(d->1,n)), ntuple(x->x-1,n)),
9-
fill!(OffsetArray(Float64, ntuple(x->x:x, n)...), 1),
109
fill!(OffsetArray{Float64}(ntuple(x->x:x, n)), 1),
1110
fill!(OffsetArray{Float64}(ntuple(x->x:x, n)...), 1),
1211
fill!(OffsetArray{Float64,n}(ntuple(x->x:x, n)), 1),
@@ -22,7 +21,7 @@ a = OffsetArray(a0)
2221
@test ndims(a) == 0
2322
@test a[] == 3
2423

25-
y = OffsetArray(Float64, -1:1, -7:7, -128:512, -5:5, -1:1, -3:3, -2:2, -1:1)
24+
y = OffsetArray{Float64}(-1:1, -7:7, -128:512, -5:5, -1:1, -3:3, -2:2, -1:1)
2625
@test indices(y) == (-1:1, -7:7, -128:512, -5:5, -1:1, -3:3, -2:2, -1:1)
2726
y[-1,-7,-128,-5,-1,-3,-2,-1] = 14
2827
y[-1,-7,-128,-5,-1,-3,-2,-1] += 5
@@ -364,6 +363,5 @@ end
364363
v = rand(5)
365364
@test OffsetVector(v, -2) == OffsetArray(v, -2)
366365
@test OffsetVector(v, -2:2) == OffsetArray(v, -2:2)
367-
@test typeof(OffsetVector(Float64, -2:2)) == typeof(OffsetArray(Float64, -2:2))
368366
@test typeof(OffsetVector{Float64}(-2:2)) == typeof(OffsetArray{Float64}(-2:2))
369367
end

0 commit comments

Comments
 (0)