Skip to content

Commit

Permalink
Drop compat for axes #435 and #442
Browse files Browse the repository at this point in the history
  • Loading branch information
martinholters committed Oct 4, 2019
1 parent 20b0973 commit 46389bf
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 15 deletions.
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,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
Expand Down
7 changes: 0 additions & 7 deletions src/Compat.jl
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,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
Expand Down
5 changes: 5 additions & 0 deletions test/old.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 0 additions & 5 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 46389bf

Please sign in to comment.