Drop compat code for occursin from #520

README.md

@@ -197,12 +197,6 @@ Currently, the `@compat` macro supports the following syntaxes:
 
 * `copy!` and `unsafe_copy!` are now `copyto!` and `unsafe_copyto!` ([#24808]).
 
-* `contains(haystack, needle)` is now `occursin(needle, haystack)` ([#26283]).
-  `occursin` also has a new method for `Char` needles ([#22435]).
-
-* `ismatch(r::Regex, str::AbstractString, offset=0)` is now `occursin(r, str)` and
-  `occursin(r, str, offset = offset)` respectively ([#24673],[#26283]).
-
 * `ipermute!` is now `invpermute!` ([#25168]).
 
 * `module_parent`, `Base.function_module`, and `Base.datatype_module` are now methods of

src/Compat.jl

@@ -36,26 +36,6 @@ import Base: Fix2
 
 include("compatmacro.jl")
 
-# PR #26283
-if VERSION < v"0.7.0-DEV.4639"
-    if isdefined(Base, :occursin)
-        import Base: occursin
-    else
-        export occursin
-    end
-    occursin(needle, haystack) = contains(haystack, needle)
-    if VERSION < v"0.7.0-DEV.3272"
-        occursin(r::Regex, s::AbstractString; offset::Integer = 0) = ismatch(r, s, offset)
-    else
-        occursin(r::Regex, s::AbstractString; offset::Integer = 0) = contains(s, r, offset)
-    end
-    # PR #22435
-    if VERSION < v"0.7.0-DEV.702"
-        occursin(needle::Char, haystack::AbstractString) = searchindex(haystack,needle) != 0
-    end
-end
-
-
 # 0.7.0-DEV.912
 if VERSION < v"0.7.0-DEV.912"
     import Base.*

test/old.jl

@@ -475,3 +475,10 @@ let a = [0,1,2,3,0,1,2,3]
     @test findprev(==(1), a, 4) == 2
     @test findprev(==(1), a, 8) == 6
 end
+
+# 0.7.0-DEV.4639
+@test occursin(r"World", "Hello, World!")
+@test occursin(r"World", "Hello, World!", offset = 4)
+@test occursin("World", "Hello, World!")
+# 0.7.0-DEV.912
+@test occursin('W', "Hello, World!")

test/runtests.jl

@@ -208,18 +208,6 @@ let A = [0, 0, 0], B = [1, 2, 3]
     @test unsafe_copyto!(A, 2, B, 1, 1) === A == [0, 1, 0]
 end
 
-# 0.7, make sure this works on 0.6
-if VERSION < v"0.7.0-DEV.3272"
-    @test contains("Hello, World!", r"World")
-end
-
-# 0.7.0-DEV.4639
-@test occursin(r"World", "Hello, World!")
-@test occursin(r"World", "Hello, World!", offset = 4)
-@test occursin("World", "Hello, World!")
-# 0.7.0-DEV.912
-@test occursin('W', "Hello, World!")
-
 # 0.7.0-DEV.3173
 @test invpermute!(permute!([1, 2], 2:-1:1), 2:-1:1) == [1, 2]