Remove unused IdxMap type parameter from ShapedAxis

jonniedie · Feb 17, 2024 · 0a18438 · 0a18438
1 parent 35221bd
commit 0a18438
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/src/axis.jl b/src/axis.jl
@@ -59,22 +59,21 @@ const NullorFlatAxis = Union{NullAxis, FlatAxis}
 
 
 """
-    sa = ShapedAxis(shape, index_map)
+    sa = ShapedAxis(shape)
 
 Preserves higher-dimensional array components in `ComponentArray`s (matrix components, for
 example)
 """
-struct ShapedAxis{Shape, IdxMap} <: AbstractAxis{IdxMap} end
-@inline ShapedAxis(Shape, IdxMap) = ShapedAxis{Shape, IdxMap}()
-ShapedAxis(Shape) = ShapedAxis(Shape, NamedTuple())
+struct ShapedAxis{Shape} <: AbstractAxis{nothing} end
+@inline ShapedAxis(Shape) = ShapedAxis{Shape}()
 ShapedAxis(::Tuple{<:Int}) = FlatAxis()
 
 const Shape = ShapedAxis
 
 unshape(ax) = ax
 unshape(ax::ShapedAxis) = Axis(indexmap(ax))
 
-Base.size(::ShapedAxis{Shape, IdxMap}) where {Shape, IdxMap} = Shape
+Base.size(::ShapedAxis{Shape}) where {Shape} = Shape
 
 
 
@@ -135,7 +134,7 @@ Axis(::NamedTuple{()}) = FlatAxis()
 Axis(x) = FlatAxis()
 
 const NotShapedAxis = Union{Axis{IdxMap}, FlatAxis, NullAxis} where {IdxMap}
-const NotPartitionedAxis = Union{Axis{IdxMap}, FlatAxis, NullAxis, ShapedAxis{Shape, IdxMap}} where {Shape, IdxMap}
+const NotPartitionedAxis = Union{Axis{IdxMap}, FlatAxis, NullAxis, ShapedAxis{Shape}} where {Shape, IdxMap}
 const NotShapedOrPartitionedAxis = Union{Axis{IdxMap}, FlatAxis, NullAxis} where {IdxMap}
 
 

diff --git a/src/show.jl b/src/show.jl
@@ -12,14 +12,14 @@ Base.show(io::IO, ::MIME"text/plain", ::PartitionedAxis{PartSz, IdxMap, Ax}) whe
 Base.show(io::IO, ::PartitionedAxis{PartSz, IdxMap, Ax}) where {PartSz, IdxMap, Ax} =
     print(io, "PartitionedAxis($PartSz, $(Ax()))")
 
-Base.show(io::IO, ::ShapedAxis{Shape, IdxMap}) where {Shape, IdxMap} =
-    print(io, "ShapedAxis($Shape, $IdxMap)")
+Base.show(io::IO, ::ShapedAxis{Shape}) where {Shape} =
+    print(io, "ShapedAxis($Shape)")
 
-Base.show(io::IO, ::MIME"text/plain", ::ViewAxis{Inds, IdxMap, Ax}) where {Inds, IdxMap, Ax} = 
+Base.show(io::IO, ::MIME"text/plain", ::ViewAxis{Inds, IdxMap, Ax}) where {Inds, IdxMap, Ax} =
     print(io, "ViewAxis($Inds, $(Ax()))")
-Base.show(io::IO, ::ViewAxis{Inds, IdxMap, <:Ax}) where {Inds, IdxMap, Ax} = 
+Base.show(io::IO, ::ViewAxis{Inds, IdxMap, <:Ax}) where {Inds, IdxMap, Ax} =
     print(io, "ViewAxis($Inds, $(Ax()))")
-Base.show(io::IO, ::ViewAxis{Inds, IdxMap, <:NullorFlatAxis}) where {Inds, IdxMap} = 
+Base.show(io::IO, ::ViewAxis{Inds, IdxMap, <:NullorFlatAxis}) where {Inds, IdxMap} =
     print(io, Inds)
 
 Base.show(io::IO, ci::ComponentIndex) = print(io, "ComponentIndex($(ci.idx), $(ci.ax))")