Merge pull request #460 from schmrlng/tuple_convert

Add general Tuple(::StaticArray) constructor and remove related convert method

Author: andyferris

src/convert.jl

@@ -9,10 +9,8 @@
 @inline convert(::Type{SA}, sa::SA) where {SA<:StaticArray} = sa
 @inline convert(::Type{SA}, x::Tuple) where {SA<:StaticArray} = SA(x) # convert -> constructor. Hopefully no loops...
 
-# A general way of going back to a tuple
-@inline function convert(::Type{Tuple}, a::StaticArray)
-    unroll_tuple(a, Length(a))
-end
+# Constructing a Tuple from a StaticArray
+@inline Tuple(a::StaticArray) = unroll_tuple(a, Length(a))
 
 @noinline function dimension_mismatch_fail(SA::Type, a::AbstractArray)
     error("Dimension mismatch. Expected input array of length $(length(SA)), got length $(length(a))")

test/FieldVector.jl

@@ -18,6 +18,8 @@
         @test length(p) === 3
         @test eltype(p) === Float64
 
+        @testinf Tuple(p) === (1.0, 2.0, 3.0)
+
         @test (p + p) === Point3D(2.0, 4.0, 6.0)
 
         @test (p[1], p[2], p[3]) === (p.x, p.y, p.z)
@@ -59,6 +61,8 @@
         @test length(p) === 2
         @test eltype(p) === Float64
 
+        @testinf Tuple(p) === (1.0, 2.0)
+
         @test (p[1], p[2]) === (p.x, p.y)
         @test (p[1], p[2]) === (1.0, 2.0)
 

test/MArray.jl

@@ -101,7 +101,7 @@
         @test m[3] === 13
         @test m[4] === 14
 
-        @test Tuple(m) === (11, 12, 13, 14)
+        @testinf Tuple(m) === (11, 12, 13, 14)
 
         @test size(m) === (2, 2)
         @test size(typeof(m)) === (2, 2)

test/MMatrix.jl

@@ -76,7 +76,7 @@
         @test m[3] === 13
         @test m[4] === 14
 
-        @test Tuple(m) === (11, 12, 13, 14)
+        @testinf Tuple(m) === (11, 12, 13, 14)
 
         @test size(m) === (2, 2)
         @test size(typeof(m)) === (2, 2)

test/MVector.jl

@@ -56,7 +56,7 @@
         @test v[2] === 12
         @test v[3] === 13
 
-        @test Tuple(v) === (11, 12, 13)
+        @testinf Tuple(v) === (11, 12, 13)
 
         @test size(v) === (3,)
         @test size(typeof(v)) === (3,)

test/SArray.jl

@@ -96,7 +96,7 @@
         @test m[3] === 13
         @test m[4] === 14
 
-        @test Tuple(m) === (11, 12, 13, 14)
+        @testinf Tuple(m) === (11, 12, 13, 14)
 
         @test size(m) === (2, 2)
         @test size(typeof(m)) === (2, 2)

test/SMatrix.jl

@@ -74,7 +74,7 @@
         @test m[3] === 13
         @test m[4] === 14
 
-        @test Tuple(m) === (11, 12, 13, 14)
+        @testinf Tuple(m) === (11, 12, 13, 14)
 
         @test size(m) === (2, 2)
         @test size(typeof(m)) === (2, 2)

test/SVector.jl

@@ -55,7 +55,7 @@
         @test v[2] === 12
         @test v[3] === 13
 
-        @test Tuple(v) === (11, 12, 13)
+        @testinf Tuple(v) === (11, 12, 13)
 
         @test size(v) === (3,)
         @test size(typeof(v)) === (3,)

test/Scalar.jl

@@ -4,8 +4,8 @@
     @test (Scalar(1) + Scalar(1.0))::Scalar{Float64} ≈ Scalar(2.0)
     @test_throws ErrorException Scalar(2)[2]
     @test Scalar(2)[] == 2
-    @test Tuple(Scalar(2)) == (2,)
-    @test Tuple(convert(Scalar{Float64}, [2.0])) == (2.0,)
+    @testinf Tuple(Scalar(2)) === (2,)
+    @testinf Tuple(convert(Scalar{Float64}, [2.0])) === (2.0,)
     a = Array{Float64, 0}(undef)
     a[] = 2
     @test Scalar(a)[] == 2

test/core.jl

@@ -149,8 +149,6 @@
     @test StaticArrays.check_length(2) == nothing
     @test StaticArrays.check_length(StaticArrays.Dynamic()) == nothing
 
-    @test convert(Tuple, @SVector [2]) == (2,)
-
     @testset "dimmatch" begin
         @test StaticArrays.dimmatch(3, 3)
         @test StaticArrays.dimmatch(3, StaticArrays.Dynamic())