Merge pull request #1554 from bjarthur/bja/indirectarrays

upgrade to IndirectArrays 1.0; drop support for 0.5
GiovineItalia · Oct 10, 2021 · 8c4bc70 · 8c4bc70
2 parents 423f170 + ab029dc
commit 8c4bc70
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Project.toml b/Project.toml
@@ -43,7 +43,7 @@ DataStructures = "0.11, 0.12, 0.13, 0.14, 0.15, 0.16, 0.17, 0.18"
 Distributions = "0.16, 0.17, 0.18, 0.19, 0.20, 0.21, 0.22, 0.23, 0.24, 0.25"
 DocStringExtensions = "0.7, 0.8"
 Hexagons = "0.2"
-IndirectArrays = "0.5"
+IndirectArrays = "1"
 IterTools = "1"
 JSON = "0.18, 0.19, 0.20, 0.21"
 Juno = "0.7, 0.8"

diff --git a/src/aesthetics.jl b/src/aesthetics.jl
@@ -346,12 +346,12 @@ function by_xy_group(aes::T, xgroup, ygroup,
 
     xgroup === nothing && ygroup === nothing && return aes_grid
 
-    function make_pooled_array(::Type{IndirectArray{T,N,A,V}}, arr::AbstractArray) where {T,N,A,V}
+    function make_pooled_array(::Type{IndirectArray{T,N,I,A,V}}, arr::AbstractArray) where {T,N,I,A,V}
         uarr = unique(arr)
         return IndirectArray(A(indexin(arr, uarr)), V(uarr))
     end
-    make_pooled_array(::Type{IndirectArray{T,R,N,RA}},
-            arr::IndirectArray{T,R,N,RA}) where {T,R,N,RA} = arr
+    make_pooled_array(::Type{IndirectArray{T,R,I,N,RA}},
+            arr::IndirectArray{T,R,I,N,RA}) where {T,R,I,N,RA} = arr
 
     for var in fieldnames(T)
         # Skipped aesthetics. Don't try to partition aesthetics for which it