Drop compat for axes #435 and #442

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

Hide file tree

Showing 4 changed files with 5 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -154,9 +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]).
 
-* `indices` is now `axes` ([#25057]). This function is not exported from Compat to avoid
-  conflicts with AxisArrays and other such packages.
-
 * `Void` is now `Nothing` with an alias `Cvoid` for C interop ([#25162]).
 
 * `Base.IteratorSize` and `Base.IteratorEltype` are available as

diff --git a/src/Compat.jl b/src/Compat.jl
@@ -46,13 +46,6 @@ end
 
 include("compatmacro.jl")
 
-# 0.7.0-DEV.2978
-@static if !isdefined(Base, :axes)
-    const axes = Base.indices
-    # NOTE: Intentionally not exported to avoid conflicts with AxisArrays
-    #export axes
-end
-
 # 0.7.0-DEV.3137
 @static if !isdefined(Base, :Nothing)
     const Nothing = Void

diff --git a/test/old.jl b/test/old.jl
@@ -572,3 +572,8 @@ end
 
 # 0.7.0-DEV.2951
 @test AbstractDict === (isdefined(Base, :AbstractDict) ? Base.AbstractDict : Base.Associative)
+
+# 0.7.0-DEV.2978
+@test Compat.axes === (isdefined(Base, :axes) ? Base.axes : Base.indices)
+@test Compat.axes(1) == ()
+@test Compat.axes(1,1) == 1:1
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -80,11 +80,6 @@ let A = [1]
     @test x == 1
 end
 
-# 0.7.0-DEV.2978
-@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