From bf32b0d0c44ad18a4c308d7f0bba7d4d2937ea0d Mon Sep 17 00:00:00 2001 From: Martin Holters Date: Fri, 31 Aug 2018 11:08:17 +0200 Subject: [PATCH] =?UTF-8?q?Remove=20defintions=20of=20`xor`=20and=20`?= =?UTF-8?q?=E2=8A=BB`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Were added in #289. --- README.md | 3 --- src/Compat.jl | 8 -------- test/runtests.jl | 3 --- 3 files changed, 14 deletions(-) diff --git a/README.md b/README.md index 00f3d1b75..644e9859f 100644 --- a/README.md +++ b/README.md @@ -273,8 +273,6 @@ Currently, the `@compat` macro supports the following syntaxes: * `reprmime(mime, x)` is now `repr(mime, x)` ([#25990]) and `mimewritable` is now `showable` ([#26089]). -* `$` is now `xor` or `⊻` ([#18977]) - * `num` and `den` are now `numerator` and `denominator` ([#19246]) * `takebuf_array` is now a method of `take!`. `takebuf_string(io)` becomes `String(take!(io))` ([#19088]) @@ -482,7 +480,6 @@ includes this fix. Find the minimum version from there. [#18082]: https://github.com/JuliaLang/julia/issues/18082 [#18629]: https://github.com/JuliaLang/julia/issues/18629 [#18727]: https://github.com/JuliaLang/julia/issues/18727 -[#18977]: https://github.com/JuliaLang/julia/issues/18977 [#19088]: https://github.com/JuliaLang/julia/issues/19088 [#19246]: https://github.com/JuliaLang/julia/issues/19246 [#19449]: https://github.com/JuliaLang/julia/issues/19449 diff --git a/src/Compat.jl b/src/Compat.jl index 7fafea270..f78e0021e 100644 --- a/src/Compat.jl +++ b/src/Compat.jl @@ -142,14 +142,6 @@ else end end -# julia#18977 -@static if !isdefined(Base, :xor) - # 0.6 - const xor = $ - const ⊻ = xor - export xor, ⊻ -end - # julia#19246 @static if !isdefined(Base, :numerator) # 0.6 diff --git a/test/runtests.jl b/test/runtests.jl index 277a53e4e..4fac83b5b 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -40,9 +40,6 @@ else end end -@test xor(1,5) == 4 -@test 1 ⊻ 5 == 4 - # supertype operator @test !(Int >: Integer) @test Integer >: Int