Skip to content

Enforce type stability and test for it #272

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
giordano merged 3 commits into from
Sep 25, 2022
Merged

Enforce type stability and test for it #272

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
c209c83
Enforce type stability and test for it
gbaraldi Sep 25, 2022
b2415f8
Use isa instead of ==
gbaraldi Sep 25, 2022
b68cb4d
But do it right
gbaraldi Sep 25, 2022
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
8 changes: 4 additions & 4 deletions src/Rootfs.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,8 +769,8 @@ function expand_gfortran_versions(platform::AbstractPlatform)
return p
end
end
function expand_gfortran_versions(ps::Vector{<:Platform})
return collect(Iterators.flatten(expand_gfortran_versions.(ps)))
function expand_gfortran_versions(ps::Vector{T}) where {T<:AbstractPlatform}
return collect(T,Iterators.flatten(expand_gfortran_versions.(ps)))
end

"""
Expand Down Expand Up @@ -806,8 +806,8 @@ function expand_cxxstring_abis(platform::AbstractPlatform; skip=Sys.isbsd)
return p
end
end
function expand_cxxstring_abis(ps::Vector{<:AbstractPlatform}; kwargs...)
return collect(Iterators.flatten(expand_cxxstring_abis.(ps; kwargs...)))
function expand_cxxstring_abis(ps::Vector{T}; kwargs...) where {T<:AbstractPlatform}
return collect(T,Iterators.flatten(expand_cxxstring_abis.(ps; kwargs...)))
end

"""
Expand Down
4 changes: 3 additions & 1 deletion test/rootfs.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ using BinaryBuilderBase
]
@test expand_gfortran_versions([Platform("x86_64", "linux"; sanitize="memory")]) ==
[Platform("x86_64", "linux"; sanitize="memory")]
@test expand_gfortran_versions(Platform[]) isa Vector{Platform}

# expand_cxxstring_abis
@test expand_cxxstring_abis(Platform("x86_64", "linux"; libc="musl")) == [
Expand All @@ -52,7 +53,8 @@ using BinaryBuilderBase
[Platform("i686", "linux"; cxxstring_abi="cxx11")]
@test expand_cxxstring_abis([Platform("x86_64", "linux"; sanitize="memory")]) ==
[Platform("x86_64", "linux"; sanitize="memory", cxxstring_abi="cxx11")]

@test expand_cxxstring_abis(Platform[]) isa Vector{Platform}

# expand_microarchitectures
@test expand_microarchitectures([AnyPlatform()]) == [AnyPlatform()]
@test sort(expand_microarchitectures(Platform("x86_64", "linux"; cuda="10.1")), by=triplet) == [
Expand Down