Skip to content

Don't export axes #442

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

Merged
merged 1 commit into from
Dec 30, 2017
Merged

Don't export axes #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,8 @@ Currently, the `@compat` macro supports the following syntaxes:

* `Associative` is now `AbstractDict` ([#25012]).

* `indices` is now `axes` ([#25057]).
* `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]).

Expand Down
3 changes: 2 additions & 1 deletion src/Compat.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -999,7 +999,8 @@ end
# 0.7.0-DEV.2978
@static if !isdefined(Base, :axes)
const axes = Base.indices
export axes
# NOTE: Intentionally not exported to avoid conflicts with AxisArrays
#export axes
end

# 0.7.0-DEV.3137
Expand Down
6 changes: 3 additions & 3 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1043,9 +1043,9 @@ end
@test AbstractDict === (isdefined(Base, :AbstractDict) ? Base.AbstractDict : Base.Associative)

# 0.7.0-DEV.2978
@test axes === (isdefined(Base, :axes) ? Base.axes : Base.indices)
@test axes(1) == ()
@test axes(1,1) == 1:1
@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)
Expand Down