Updates

jump-dev · Apr 22, 2021 · 2c008eb · 2c008eb
1 parent 4ed2a9d
commit 2c008eb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/Containers/container.jl b/src/Containers/container.jl
@@ -164,10 +164,12 @@ function _sparseaxisarray(dict::Dict{Any,Any}, f, indices)
     return SparseAxisArray(d)
 end
 
+# Don't use length-1 tuples if there is only one index!
+_container_key(i::Tuple) = i
+_container_key(i::Tuple{T}) where {T} = i[1]
+
 function container(f::Function, indices, D::Type{<:AbstractDict})
-    # Don't use length-1 tuples if there is only one index!
-    key(i) = length(i) == 1 ? i[1] : i
-    return D(key(i) => f(i...) for i in indices)
+    return D(_container_key(i) => f(i...) for i in indices)
 end
 
 function container(::Function, ::Any, D::Type)

diff --git a/test/Containers/macro.jl b/test/Containers/macro.jl
@@ -125,7 +125,11 @@ using Test
         @test z[1, 2] == 3
     end
     @testset "Invalid container" begin
-        @test_throws ErrorException Containers.@container(
+        err = ErrorException(
+            "Unable to build a container with the provided type $(Int). " *
+            "Implement `Containers.container`.",
+        )
+        @test_throws err Containers.@container(
             x[i = 1:2, j = 1:2],
             i + j,
             container = Int