Drop compat code for textwidth from #644

JuliaLang · Oct 8, 2019 · 221984a · 221984a
1 parent 563f2bf
commit 221984a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -157,8 +157,6 @@ Currently, the `@compat` macro supports the following syntaxes:
 
 * `reprmime(mime, x)` is now `repr(mime, x)` ([#25990]) and `mimewritable` is now `showable` ([#26089]).
 
-* `strwidth` and `charwidth` are now merged into `textwidth` ([#23667]).
-
 * `Associative` is now `AbstractDict` ([#25012]).
 
 * `indices` is now `axes` ([#25057]). This function is not exported from Compat to avoid

diff --git a/src/Compat.jl b/src/Compat.jl
@@ -38,18 +38,6 @@ const tr = LinearAlgebra.tr
 
 include("compatmacro.jl")
 
-if VERSION < v"0.7.0-DEV.1930"
-    # no textwidth definition in Base
-    export textwidth
-    textwidth(c::Char) = charwidth(c)
-    textwidth(c::AbstractString) = strwidth(c)
-elseif v"0.7.0-DEV.2915" ≤ VERSION < v"0.7.0-DEV.3393"
-    # textwidth definition moved to Unicode module
-    import Unicode
-    const textwidth = Unicode.textwidth
-    export textwidth
-end
-
 # 0.7.0-DEV.2915
 module Unicode
     export graphemes, textwidth, isvalid,

diff --git a/test/old.jl b/test/old.jl
@@ -546,3 +546,7 @@ end
 @test ComplexF16 === Complex{Float16}
 @test ComplexF32 === Complex{Float32}
 @test ComplexF64 === Complex{Float64}
+
+# 0.7.0-DEV.1930
+@test textwidth("A") == 1
+@test textwidth('A') == 1
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -69,10 +69,6 @@ if VERSION < v"0.7.0-DEV.880"
     end
 end
 
-# 0.7.0-DEV.1930
-@test textwidth("A") == 1
-@test textwidth('A') == 1
-
 # 0.7
 let A = [1]
     local x = 0