Skip to content

Commit 27a178c

Browse files
committed
Drop compat code for AbstractDict from #435
1 parent f6ab8aa commit 27a178c

File tree

4 files changed

+3
-11
lines changed

4 files changed

+3
-11
lines changed

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,6 @@ Currently, the `@compat` macro supports the following syntaxes:
154154

155155
* `reprmime(mime, x)` is now `repr(mime, x)` ([#25990]) and `mimewritable` is now `showable` ([#26089]).
156156

157-
* `Associative` is now `AbstractDict` ([#25012]).
158-
159157
* `indices` is now `axes` ([#25057]). This function is not exported from Compat to avoid
160158
conflicts with AxisArrays and other such packages.
161159

src/Compat.jl

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,6 @@ end
4646

4747
include("compatmacro.jl")
4848

49-
# 0.7.0-DEV.2951
50-
@static if !isdefined(Base, :AbstractDict)
51-
const AbstractDict = Associative
52-
export AbstractDict
53-
end
54-
5549
# 0.7.0-DEV.2978
5650
@static if !isdefined(Base, :axes)
5751
const axes = Base.indices

test/old.jl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -569,3 +569,6 @@ end
569569
# 0.7.0-DEV.3393
570570
@test !isnumeric('a')
571571
@test isnumeric('1')
572+
573+
# 0.7.0-DEV.2951
574+
@test AbstractDict === (isdefined(Base, :AbstractDict) ? Base.AbstractDict : Base.Associative)

test/runtests.jl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,6 @@ let A = [1]
8080
@test x == 1
8181
end
8282

83-
# 0.7.0-DEV.2951
84-
@test AbstractDict === (isdefined(Base, :AbstractDict) ? Base.AbstractDict : Base.Associative)
85-
8683
# 0.7.0-DEV.2978
8784
@test Compat.axes === (isdefined(Base, :axes) ? Base.axes : Base.indices)
8885
@test Compat.axes(1) == ()

0 commit comments

Comments
 (0)