Skip to content

Remove a convert method #52

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

Open
davidanthoff wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Remove a convert method #52

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
1a3da0a
Remove a convert method
davidanthoff Dec 22, 2018
a5daccd
Merge branch 'master' into remove-a-convert
davidanthoff Aug 4, 2019
6c55dfb
Add VERSION check to a convert method
davidanthoff Aug 4, 2019
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
4 changes: 3 additions & 1 deletion src/scalar/core.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ Base.convert(::Type{DataValue}, ::Nothing) = DataValue{Union{}}()

Base.convert(::Type{Union{Missing, T}}, value::DataValues.DataValue{T}) where T = get(value, missing)
Base.convert(::Type{Union{Missing, T}}, ::DataValues.DataValue{Union{}}) where T = missing
Base.convert(::Type{Any}, ::DataValue{Union{}}) = NA
@static if VERSION < v"1.1"
Base.convert(::Type{Any}, ::DataValue{Union{}}) = NA
end
Base.convert(::Type{Missing}, ::DataValue{Union{}}) = missing

Base.promote_rule(::Type{DataValue{S}}, ::Type{T}) where {S,T} = DataValue{promote_type(S, T)}
Expand Down
2 changes: 2 additions & 0 deletions test/scalar/test_basederived.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,8 @@ end
@test isequal(convert(DataValue, "a"), DataValue("a"))
@test isequal(convert(DataValue, DataValue("a")), DataValue("a"))

@test convert(Any, NA) == NA

@test promote_type(DataValue{Int}, Int) === DataValue{Int}
@test promote_type(DataValue{Union{}}, Int) === DataValue{Int}
@test promote_type(DataValue{Float64}, DataValue{Int}) === DataValue{Float64}
Expand Down