Skip to content

Commit

Permalink
Drop compat code for objectid from #486
Browse files Browse the repository at this point in the history
  • Loading branch information
martinholters committed Oct 8, 2019
1 parent 8215da4 commit 02f33dd
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 13 deletions.
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,6 @@ Currently, the `@compat` macro supports the following syntaxes:
for entries with no match and gives the index of the first (rather than the last) match
([#25662], [#25998]).

* `object_id` is now `objectid` ([#25615]).

* `LinSpace` is now `LinRange` ([#25896]).

* `isupper`, `islower`, `ucfirst` and `lcfirst` are now `isuppercase`, `islowercase`,
Expand Down
6 changes: 0 additions & 6 deletions src/Compat.jl
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,6 @@ end
end
end

# 0.7.0-DEV.3455
@static if !isdefined(Base, :objectid)
const objectid = object_id
export objectid
end

@static if VERSION < v"0.7.0-DEV.3272"
zero2nothing(x::Integer) = x == 0 ? nothing : x
zero2nothing(x::AbstractUnitRange{<:Integer}) = x == 0:-1 ? nothing : x
Expand Down
3 changes: 3 additions & 0 deletions test/old.jl
Original file line number Diff line number Diff line change
Expand Up @@ -730,3 +730,6 @@ end

# 0.7.0-DEV.3455
@test hasmethod(sin, Tuple{Float64})
let x = y = 1
@test objectid(x) == objectid(y)
end
5 changes: 0 additions & 5 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,6 @@ end

@test codeunit("foo") == codeunit(SubString("fooαβγ",1,3)) == UInt8

# 0.7.0-DEV.3455
let x = y = 1
@test objectid(x) == objectid(y)
end

# 0.7.0-DEV.3415
for (f1, f2, i) in ((Compat.findfirst, Compat.findnext, 1),
(Compat.findlast, Compat.findprev, 2))
Expand Down

0 comments on commit 02f33dd

Please sign in to comment.