Skip to content

Resolve ambiguity for convert(::Type{<:Scalar}, ::StaticArray) #808

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 15, 2020
Merged

Resolve ambiguity for convert(::Type{<:Scalar}, ::StaticArray) #808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
63fb815
Resolve ambiguity for convert(::Type{<:Scalar}, ::StaticArray)
Liozou Jul 9, 2020
e1cc619
Set the number of allowable ambiguities to 0
Liozou Jul 10, 2020
8d4712a
Constitently lower the number of allowable ambiguities
Liozou Jul 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/convert.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

# this covers most conversions and "statically-sized reshapes"
@inline convert(::Type{SA}, sa::StaticArray) where {SA<:StaticArray} = SA(Tuple(sa))
@inline convert(::Type{SA}, sa::StaticArray) where {SA<:Scalar} = SA((sa[],)) # disambiguation
@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...

Expand Down
6 changes: 3 additions & 3 deletions test/ambiguities.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@

const allowable_ambiguities =
if VERSION < v"1.1"
4
3
elseif VERSION < v"1.2"
2
else
1
else
0
end

@test length(detect_ambiguities(Base, LinearAlgebra, StaticArrays)) <= allowable_ambiguities
4 changes: 4 additions & 0 deletions test/convert.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,8 @@ end # testset
# Issue #651
@testinf SVector{0,Float64}(Any[]) === SVector{0,Float64}()
@testinf SVector{0,Float64}(Int8[]) === SVector{0,Float64}()

# PR #808
@test Scalar{Int}[SVector{1,Int}(3), SVector{1,Float64}(2.0)] == [Scalar{Int}(3), Scalar{Int}(2)]
@test Scalar[SVector{1,Int}(3), SVector{1,Float64}(2.0)] == [Scalar{Int}(3), Scalar{Float64}(2.0)]
end