From df497ab3656c48f063d6c096fe4e786de41842bb Mon Sep 17 00:00:00 2001 From: yha Date: Sun, 15 Nov 2020 23:40:56 +0200 Subject: [PATCH 1/2] Remove obsolete ambiguity resolution with OffsetArrays. --- Project.toml | 7 ++++++- src/CircularArrays.jl | 4 ---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Project.toml b/Project.toml index 3b536a8..bedcde9 100644 --- a/Project.toml +++ b/Project.toml @@ -7,8 +7,13 @@ url = "https://github.com/Vexatos/CircularArrays.jl" version = "1.1.1" [deps] +# The OffsetArrays dependency is not used. +# It's listed as a dependency to allow a compat entry, since versions earlier +# than OffsetArrays 1.3 would cause method ambiguities with this package, +# which are triggered by similar(arr) when arr.data::OffsetArray. +# See #3 and OffsetArrays#6. OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881" [compat] -OffsetArrays = "1.1.2" +OffsetArrays = "1.3" julia = "1.3" diff --git a/src/CircularArrays.jl b/src/CircularArrays.jl index 4fc63a8..f1495ff 100644 --- a/src/CircularArrays.jl +++ b/src/CircularArrays.jl @@ -46,10 +46,6 @@ CircularArray(def::T, size) where T = CircularArray(fill(def, size)) @inline Base.similar(arr::CircularArray, ::Type{T}, dims::Tuple{Base.DimOrInd, Vararg{Base.DimOrInd}}) where T = _similar(arr,T,dims) # Ambiguity resolution with Base @inline Base.similar(arr::CircularArray, ::Type{T}, dims::Tuple{Int64,Vararg{Int64}}) where T = _similar(arr,T,dims) -# Ambiguity resolution with a type-pirating OffsetArrays method. See OffsetArrays issue #87. -# Ambiguity is triggered in the case similar(arr) where arr.data::OffsetArray. -using OffsetArrays: OffsetAxisKnownLength -@inline Base.similar(arr::CircularArray, ::Type{T}, dims::Tuple{OffsetAxisKnownLength, Vararg{OffsetAxisKnownLength}}) where T = _similar(arr,T,dims) CircularVector(data::AbstractArray{T, 1}) where T = CircularVector{T}(data) CircularVector(def::T, size::Int) where T = CircularVector{T}(fill(def, size)) From dfa4db98d31a6d58e3d222313d211750a2d113c2 Mon Sep 17 00:00:00 2001 From: yha Date: Sun, 15 Nov 2020 23:52:11 +0200 Subject: [PATCH 2/2] add self-reference to this PR. --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index bedcde9..a9f3d41 100644 --- a/Project.toml +++ b/Project.toml @@ -11,7 +11,7 @@ version = "1.1.1" # It's listed as a dependency to allow a compat entry, since versions earlier # than OffsetArrays 1.3 would cause method ambiguities with this package, # which are triggered by similar(arr) when arr.data::OffsetArray. -# See #3 and OffsetArrays#6. +# See #3, #8 and OffsetArrays#6. OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881" [compat]