Test fixes

JuliaLang · Dec 15, 2017 · e44a7df · e44a7df
1 parent c8ba97a
commit e44a7df
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/base/missing.jl b/base/missing.jl
@@ -31,9 +31,14 @@ promote_rule(::Type{Missing}, ::Type{Any}) = Any
 promote_rule(::Type{Missing}, ::Type{Missing}) = Missing
 
 convert(::Type{Union{T, Missing}}, x) where {T} = convert(T, x)
+# To fix ambiguities
+convert(::Type{Missing}, ::Missing) = missing
+convert(::Type{Void}, ::Void) = nothing
+convert(::Type{Union{Void, Missing}}, x::Union{Void, Missing}) = x
+convert(::Type{Union{Void, Missing}}, x) =
+    throw(MethodError(convert, (Union{Void, Missing}, x)))
 # To print more appropriate message than "T not defined"
 convert(::Type{Missing}, x) = throw(MethodError(convert, (Missing, x)))
-convert(::Type{Missing}, ::Missing) = missing
 
 # Comparison operators
 ==(::Missing, ::Missing) = missing

diff --git a/test/missing.jl b/test/missing.jl
@@ -13,7 +13,11 @@ end
 @testset "convert" begin
     @test convert(Union{Int, Missing}, 1) === 1
     @test convert(Union{Int, Missing}, 1.0) === 1
+    @test convert(Union{Void, Missing}, missing) === missing
+    @test convert(Union{Void, Missing}, nothing) === nothing
+
     @test_throws MethodError convert(Missing, 1)
+    @test_throws MethodError convert(Union{Void, Missing}, 1)
     @test_throws MethodError convert(Union{Int, Missing}, "a")
 end
 

diff --git a/test/strings/basic.jl b/test/strings/basic.jl
@@ -242,7 +242,7 @@ end
 end
 
 @testset "issue #10307" begin
-    @test typeof(map(x -> parse(Int16, x), AbstractString[])) == Vector{Int16}
+    @test typeof(map(x -> parse(Int16, x), AbstractString[])) == Vector{Union{Int16, Void}}
 
     for T in [Int8, UInt8, Int16, UInt16, Int32, UInt32, Int64, UInt64, Int128, UInt128]
         for i in [typemax(T), typemin(T)]