Fix ambiguities (#228)

* fix ambiguities * cleanup * cleanup
JuliaIO · Feb 6, 2025 · 74fdfa4 · 74fdfa4
1 parent c1873df
commit 74fdfa4
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 25 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.9'
+          - '1.10'
           - '1' # Leave this line unchanged. '1' will automatically expand to the latest stable 1.x release of Julia.
           - 'nightly'
         os:
@@ -45,4 +45,4 @@ jobs:
       - uses: julia-actions/julia-processcoverage@v1
       - uses: codecov/codecov-action@v1
         with:
-          file: lcov.info
+          file: lcov.info
diff --git a/src/array.jl b/src/array.jl
@@ -1,4 +1,3 @@
-
 macro implement_array_methods(t)
     t = esc(t)
     quote
@@ -23,8 +22,8 @@ macro implement_array_methods(t)
             return $_copyto!(dest, Rdest, src, Rsrc)
         end
         # For ambiguity
-        copyto!(dest::PermutedDimsArray, src::$t) = DiskArrays._copyto!(dest, src)
-        function copyto!(dest::PermutedDimsArray{T,N}, src::$t{T,N}) where {T,N}
+        Base.copyto!(dest::PermutedDimsArray, src::$t) = DiskArrays._copyto!(dest, src)
+        function Base.copyto!(dest::PermutedDimsArray{T,N}, src::$t{T,N}) where {T,N}
             return $_copyto!(dest, src)
         end
 

diff --git a/src/generator.jl b/src/generator.jl
@@ -76,5 +76,6 @@ macro implement_generator(t)
     t = esc(t)
     quote
         Base.Generator(f, A::$t) = $DiskGenerator(f, A)
+        Base.Generator(::Type{T}, A::$t) where T = $DiskGenerator(T, A)
     end
 end
diff --git a/src/zip.jl b/src/zip.jl
@@ -2,23 +2,6 @@
 struct DiskZip{Is<:Tuple}
     is::Is
 end
-Base.iterate(dz::DiskZip) = Base.iterate(Iterators.Zip(dz.is))
-Base.iterate(dz::DiskZip, i) = Base.iterate(Iterators.Zip(dz.is), i)
-Base.first(dz::DiskZip) = Base.first(Iterators.Zip(dz.is))
-Base.last(dz::DiskZip) = Base.last(Iterators.Zip(dz.is))
-Base.length(dz::DiskZip) = Base.length(Iterators.Zip(dz.is))
-Base.size(dz::DiskZip) = Base.size(Iterators.Zip(dz.is))
-function Base.IteratorSize(::Type{DiskZip{Is}}) where {Is<:Tuple}
-    return Base.IteratorSize(Iterators.Zip{Is})
-end
-function Base.IteratorEltype(::Type{DiskZip{Is}}) where {Is<:Tuple}
-    return Base.IteratorEltype(Iterators.Zip{Is})
-end
-
-# Rechunk using the chunks of the first Chunked array
-# This forces the iteration order to be the same for
-# all arrays.
-
 function DiskZip(As::AbstractArray...)
     map(As) do A
         size(A) == size(first(As)) ||
@@ -41,7 +24,21 @@ function DiskZip(As::AbstractArray...)
         return DiskZip(rechunked)
     end
 end
-# # For now we only allow zip on exact same-sized arrays
+
+Base.iterate(dz::DiskZip) = Base.iterate(Iterators.Zip(dz.is))
+Base.iterate(dz::DiskZip, i) = Base.iterate(Iterators.Zip(dz.is), i)
+Base.first(dz::DiskZip) = Base.first(Iterators.Zip(dz.is))
+Base.last(dz::DiskZip) = Base.last(Iterators.Zip(dz.is))
+Base.length(dz::DiskZip) = Base.length(Iterators.Zip(dz.is))
+Base.size(dz::DiskZip) = Base.size(Iterators.Zip(dz.is))
+function Base.IteratorSize(::Type{DiskZip{Is}}) where {Is<:Tuple}
+    return Base.IteratorSize(Iterators.Zip{Is})
+end
+function Base.IteratorEltype(::Type{DiskZip{Is}}) where {Is<:Tuple}
+    return Base.IteratorEltype(Iterators.Zip{Is})
+end
+
+# For now we only allow zip on exact same-sized arrays
 
 # Collect zipped disk arrays in the right order
 function Base.collect(dz::DiskZip)

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -10,8 +10,7 @@ using Aqua
 # JET.report_package(DiskArrays)
 
 if VERSION >= v"1.9.0"
-    # These dont resolve even though the suggested methods exist
-    # Aqua.test_ambiguities([DiskArrays, Base, Core])
+    Aqua.test_ambiguities([DiskArrays, Base, Core])
     Aqua.test_unbound_args(DiskArrays)
     Aqua.test_stale_deps(DiskArrays)
     Aqua.test_undefined_exports(DiskArrays)