diff --git a/README.md b/README.md index 258ad5b79..1e6af2829 100644 --- a/README.md +++ b/README.md @@ -81,9 +81,6 @@ Currently, the `@compat` macro supports the following syntaxes: * `using Compat.UUIDs` is provided on versions older than 0.7, where this library is not yet part of the standard library ([#25819]). -* `using Compat.Markdown` is provided on versions older than 0.7, where this library is - not yet part of the standard library ([#25738]). - * `using Compat.Statistics` is provided on versions older than 0.7, where this library is not yet part of the standard library ([#27834]). diff --git a/src/Compat.jl b/src/Compat.jl index fb557db51..807511a97 100644 --- a/src/Compat.jl +++ b/src/Compat.jl @@ -27,16 +27,11 @@ import Printf import LinearAlgebra import SparseArrays import Random +import Markdown include("compatmacro.jl") -if VERSION < v"0.7.0-DEV.3589" - const Markdown = Base.Markdown -else - import Markdown -end - if VERSION < v"0.7.0-DEV.2609" @eval module SuiteSparse if Base.USE_GPL_LIBS diff --git a/test/old.jl b/test/old.jl index 5320545ee..2ae2764f5 100644 --- a/test/old.jl +++ b/test/old.jl @@ -133,6 +133,10 @@ Random.seed!(rng, 1) @test rand(rng) ≈ 0.23603334566204692 @test 0 < rand(Random.GLOBAL_RNG, Random.RangeGenerator(1:3)) < 4 +# 0.7.0-DEV.3589 +import Compat.Markdown +@test isa(Markdown.parse("foo"), Markdown.MD) + # tests of removed functionality (i.e. justs tests Base) diff --git a/test/runtests.jl b/test/runtests.jl index f49d74f62..3877fd755 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -483,10 +483,6 @@ module TestUUIDs @test uuid4() isa UUID end -# 0.7.0-DEV.3589 -import Compat.Markdown -@test isa(Markdown.parse("foo"), Markdown.MD) - @test repr("text/plain", "string") == "\"string\"" #25990 @test showable("text/plain", 3.14159) #26089