diff --git a/README.md b/README.md index 03d91d430..debb739ec 100644 --- a/README.md +++ b/README.md @@ -52,9 +52,6 @@ Currently, the `@compat` macro supports the following syntaxes: ## Module Aliases -* `using Compat.LibGit2` is provided on versions older than 0.7, where this library is - not yet part of the standard library ([#25706]). - * `using Compat.UUIDs` is provided on versions older than 0.7, where this library is not yet part of the standard library ([#25819]). diff --git a/src/Compat.jl b/src/Compat.jl index 20d98a6ab..6644e3577 100644 --- a/src/Compat.jl +++ b/src/Compat.jl @@ -49,6 +49,7 @@ enable_debug(x::Bool) = x import Distributed import Pkg import InteractiveUtils +import LibGit2 include("compatmacro.jl") @@ -74,12 +75,6 @@ end end end -@static if VERSION < v"0.7.0-DEV.3724" - const LibGit2 = Base.LibGit2 -else - import LibGit2 -end - # 0.7.0-DEV.2695 @static if !isdefined(Base, :AbstractDisplay) const AbstractDisplay = Display diff --git a/test/old.jl b/test/old.jl index 78d572a3a..46e863804 100644 --- a/test/old.jl +++ b/test/old.jl @@ -209,6 +209,14 @@ module TestInteractiveUtils @test isdefined(@__MODULE__, :varinfo) end +module TestLibGit2 + using Compat + using Compat.LibGit2 + using Compat.Test + @test isdefined(@__MODULE__, :LibGit2) + @test isdefined(@__MODULE__, :GitRepo) +end + # tests of removed functionality (i.e. justs tests Base) diff --git a/test/runtests.jl b/test/runtests.jl index dfb1f6c4a..6e0ecd33b 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -82,14 +82,6 @@ end @test codeunit("foo") == codeunit(SubString("fooαβγ",1,3)) == UInt8 -module TestLibGit2 - using Compat - using Compat.LibGit2 - using Compat.Test - @test isdefined(@__MODULE__, :LibGit2) - @test isdefined(@__MODULE__, :GitRepo) -end - @test eltype(Base.Multimedia.displays) <: AbstractDisplay # 0.7.0-DEV.3481