From cfa046ecb725ec8110e1647e2bf9211d602ca314 Mon Sep 17 00:00:00 2001
From: Martin Holters <martin.holters@hsu-hh.de>
Date: Tue, 8 Oct 2019 17:28:58 +0200
Subject: [PATCH] Drop compat code for `repr` and `showable` from #497

---
 README.md        | 2 --
 src/Compat.jl    | 9 ---------
 test/old.jl      | 3 +++
 test/runtests.jl | 3 ---
 4 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 5c3466c7c..8fcd5c556 100644
--- a/README.md
+++ b/README.md
@@ -121,8 +121,6 @@ Currently, the `@compat` macro supports the following syntaxes:
 
 ## Renaming
 
-* `reprmime(mime, x)` is now `repr(mime, x)` ([#25990]) and `mimewritable` is now `showable` ([#26089]).
-
 * `Compat.indexin` accepts any iterable as first argument, returns `nothing` (rather than `0`)
    for entries with no match and gives the index of the first (rather than the last) match
    ([#25662], [#25998]).
diff --git a/src/Compat.jl b/src/Compat.jl
index fdae59438..ea1b3dbda 100644
--- a/src/Compat.jl
+++ b/src/Compat.jl
@@ -75,15 +75,6 @@ end
     end
 end
 
-@static if VERSION < v"0.7.0-DEV.4047" #26089
-    showable(mime, x) = mimewritable(mime, x)
-    export showable
-end
-
-@static if VERSION < v"0.7.0-DEV.4010" #25990
-    Base.repr(mime::Union{AbstractString,MIME}, x) = reprmime(mime, x)
-end
-
 # https://github.com/JuliaLang/julia/pull/25647
 @static if VERSION < v"0.7.0-DEV.3526"
     names(m; all=false, imported=false) = Base.names(m, all, imported)
diff --git a/test/old.jl b/test/old.jl
index 72e5a74d1..821b587e8 100644
--- a/test/old.jl
+++ b/test/old.jl
@@ -773,3 +773,6 @@ end
 
 @test findall([true, false, true]) == [1, 3]
 @test findall(in([1, 2]), [1]) == [1]
+
+@test repr("text/plain", "string") == "\"string\"" #25990
+@test showable("text/plain", 3.14159) #26089
diff --git a/test/runtests.jl b/test/runtests.jl
index 70604c3fb..d35f5c3e2 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -97,9 +97,6 @@ module TestUUIDs
     @test uuid4() isa UUID
 end
 
-@test repr("text/plain", "string") == "\"string\"" #25990
-@test showable("text/plain", 3.14159) #26089
-
 # 0.7.0-DEV.3526
 module TestNames
     export foo