Drop compat code for Nothing and Cvoid from #435

JuliaLang · Oct 8, 2019 · d744d24 · d744d24
1 parent 5522d24
commit d744d24
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -154,8 +154,6 @@ Currently, the `@compat` macro supports the following syntaxes:
 
 * `reprmime(mime, x)` is now `repr(mime, x)` ([#25990]) and `mimewritable` is now `showable` ([#26089]).
 
-* `Void` is now `Nothing` with an alias `Cvoid` for C interop ([#25162]).
-
 * `Base.IteratorSize` and `Base.IteratorEltype` are available as
   `Compat.IteratorSize` and `Compat.IteratorEltype` ([#25402]).
 

diff --git a/src/Compat.jl b/src/Compat.jl
@@ -46,13 +46,6 @@ end
 
 include("compatmacro.jl")
 
-# 0.7.0-DEV.3137
-@static if !isdefined(Base, :Nothing)
-    const Nothing = Void
-    const Cvoid = Void
-    export Nothing, Cvoid
-end
-
 # https://github.com/JuliaLang/julia/pull/29679
 if VERSION < v"1.1.0-DEV.472"
     export isnothing

diff --git a/test/old.jl b/test/old.jl
@@ -577,3 +577,7 @@ end
 @test Compat.axes === (isdefined(Base, :axes) ? Base.axes : Base.indices)
 @test Compat.axes(1) == ()
 @test Compat.axes(1,1) == 1:1
+
+# 0.7.0-DEV.3137
+@test Nothing === (isdefined(Base, :Nothing) ? Base.Nothing : Base.Void)
+@test Nothing === Cvoid
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -80,10 +80,6 @@ let A = [1]
     @test x == 1
 end
 
-# 0.7.0-DEV.3137
-@test Nothing === (isdefined(Base, :Nothing) ? Base.Nothing : Base.Void)
-@test Nothing === Cvoid
-
 # 0.7.0-DEV.3017
 @test isa(Some(1), Some{Int})
 @test convert(Some{Float64}, Some(1)) == Some(1.0)