diff --git a/README.md b/README.md index 4af20ae9b..1ac6f3bb0 100644 --- a/README.md +++ b/README.md @@ -147,8 +147,6 @@ Currently, the `@compat` macro supports the following syntaxes: * `reprmime(mime, x)` is now `repr(mime, x)` ([#25990]) and `mimewritable` is now `showable` ([#26089]). -* `copy!` and `unsafe_copy!` are now `copyto!` and `unsafe_copyto!` ([#24808]). - * `module_parent`, `Base.function_module`, and `Base.datatype_module` are now methods of a new function called `parentmodule` ([#25629]). diff --git a/src/Compat.jl b/src/Compat.jl index d47fac482..bb416823a 100644 --- a/src/Compat.jl +++ b/src/Compat.jl @@ -70,13 +70,6 @@ end end end -# 0.7.0-DEV.3057 -@static if !isdefined(Base, :copyto!) - const copyto! = Base.copy! - const unsafe_copyto! = Base.unsafe_copy! - export copyto!, unsafe_copyto! -end - # 0.7.0-DEV.3272, keep this definition for 0.6 compatibility @static if VERSION < v"0.7.0-DEV.3272" Base.contains(str::AbstractString, r::Regex) = ismatch(r, str) diff --git a/test/old.jl b/test/old.jl index 0cc102c3d..a5fc1fe55 100644 --- a/test/old.jl +++ b/test/old.jl @@ -605,3 +605,11 @@ end # 0.7.0-DEV.3172 @test replace("abcb", "b"=>"c") == "accc" @test replace("abcb", "b"=>"c", count=1) == "accb" + +# 0.7.0-DEV.3057 +let A = [0, 0, 0], B = [1, 2, 3] + @test copyto!(A, B) === A == B +end +let A = [0, 0, 0], B = [1, 2, 3] + @test unsafe_copyto!(A, 2, B, 1, 1) === A == [0, 1, 0] +end diff --git a/test/runtests.jl b/test/runtests.jl index f02d3380e..6c49b2e91 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -80,14 +80,6 @@ let A = [1] @test x == 1 end -# 0.7.0-DEV.3057 -let A = [0, 0, 0], B = [1, 2, 3] - @test copyto!(A, B) === A == B -end -let A = [0, 0, 0], B = [1, 2, 3] - @test unsafe_copyto!(A, 2, B, 1, 1) === A == [0, 1, 0] -end - # 0.7.0-DEV.3025 let c = CartesianIndices((1:3, 1:2)), l = LinearIndices((1:3, 1:2)) @test LinearIndices(c) == collect(l)