Drop compat code for cp and mv from #512

README.md

@@ -72,8 +72,6 @@ Currently, the `@compat` macro supports the following syntaxes:
 
 * `range` supporting `stop` as positional argument ([#28708]).
 
-* `Compat.mv` and `Compat.cp` with `force` keyword argument ([#26069]).
-
 * `Compat.accumulate`, `Compat.accumulate!`, `Compat.all`, `Compat.any`,
   `Compat.cumprod`, `Compat.cumprod!`, `Compat.cumsum`, `Compat.cumsum!`,
   `Compat.findmax`, `Compat.findmin`, `Compat.mapreduce`, `Compat.maximum`,

src/Compat.jl

@@ -76,13 +76,6 @@ end
     end
 end
 
-@static if VERSION < v"0.7.0-DEV.3995"
-    cp(src::AbstractString, dst::AbstractString; force::Bool=false, follow_symlinks::Bool=false) =
-        Base.cp(src, dst; remove_destination = force, follow_symlinks = follow_symlinks)
-    mv(src::AbstractString, dst::AbstractString; force::Bool=false) =
-        Base.mv(src, dst; remove_destination = force)
-end
-
 if VERSION < v"0.7.0-DEV.3972"
     function indexin(a, b::AbstractArray)
         inds = keys(b)

test/old.jl

@@ -844,3 +844,23 @@ end
 @test Compat.range(2, stop=8) == 2:8
 @test Compat.range(2, step=2, length=8) == 2:2:16
 @test Compat.range(1.0, stop=2.0, length=3) == 1.0:0.5:2.0
+
+# 0.7.0-DEV.3995
+mktempdir(@__DIR__) do dir
+    src = joinpath(dir, "src.jl")
+    touch(src)
+    dest = joinpath(dir, "dest.jl")
+    touch(dest)
+    open(src, "w") do f
+        write(f, "Hello, world!")
+    end
+    Compat.cp(src, dest, force = true)
+    open(dest, "r") do f
+        @test read(f, String) == "Hello, world!"
+    end
+    Compat.mv(src, dest, force = true)
+    open(dest, "r") do f
+        @test read(f, String) == "Hello, world!"
+    end
+    @test readdir(dir) == ["dest.jl"]
+end

test/runtests.jl

@@ -82,26 +82,6 @@ end
 
 @test codeunit("foo") == codeunit(SubString("fooαβγ",1,3)) == UInt8
 
-# 0.7.0-DEV.3995
-mktempdir(@__DIR__) do dir
-    src = joinpath(dir, "src.jl")
-    touch(src)
-    dest = joinpath(dir, "dest.jl")
-    touch(dest)
-    open(src, "w") do f
-        write(f, "Hello, world!")
-    end
-    Compat.cp(src, dest, force = true)
-    open(dest, "r") do f
-        @test read(f, String) == "Hello, world!"
-    end
-    Compat.mv(src, dest, force = true)
-    open(dest, "r") do f
-        @test read(f, String) == "Hello, world!"
-    end
-    @test readdir(dir) == ["dest.jl"]
-end
-
 # 0.7.0-DEV.3972
 @test Compat.indexin([1, 2], [1, 0, 1]) == [1, nothing]