Drop compat code for CartesianRange in at-compat from #377

JuliaLang · Oct 8, 2019 · f44606b · f44606b
1 parent ebc8817
commit f44606b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -43,11 +43,6 @@ Please check the list below for the specific syntax you need.
 
 Currently, the `@compat` macro supports the following syntaxes:
 
-* `@compat foo(::CartesianRange{N})` to replace the former
-  `foo(::CartesianRange{CartesianIndex{N}})` ([#20974]). Note that
-  `CartesianRange` now has two type parameters, so using them as
-  fields in other `struct`s requires manual intervention.
-
 ## Module Aliases
 
 ## New functions, macros, and methods

diff --git a/src/compatmacro.jl b/src/compatmacro.jl
@@ -11,14 +11,6 @@ function _compat(ex::Expr)
         # Passthrough
         return ex
     end
-    if VERSION < v"0.7.0-DEV.880"
-        if ex.head == :curly && ex.args[1] == :CartesianRange && length(ex.args) >= 2
-            a = ex.args[2]
-            if a != :CartesianIndex && !(isa(a, Expr) && a.head == :curly && a.args[1] == :CartesianIndex)
-                return Expr(:curly, :CartesianRange, Expr(:curly, :CartesianIndex, ex.args[2]))
-            end
-        end
-    end
     if VERSION < v"0.7.0-DEV.2562"
         if ex.head == :call && ex.args[1] == :finalizer
             ex.args[2], ex.args[3] = ex.args[3], ex.args[2]

diff --git a/test/old.jl b/test/old.jl
@@ -1295,3 +1295,9 @@ let
     @test func5(y=3, x=2) == 6
     @test_throws UndefKeywordError func5(x=2)
 end
+
+let
+    @compat cr(::CartesianIndices{2}) = 2
+    @test cr(CartesianIndices((5, 3))) == 2
+    @test_throws MethodError cr(CartesianIndices((5, 3, 2)))
+end
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -55,20 +55,6 @@ for x in (3.1, -17, 3//4, big(111.1), Inf)
     @test minmax(x) == (x, x)
 end
 
-let
-    @compat cr(::CartesianIndices{2}) = 2
-    @test cr(CartesianIndices((5, 3))) == 2
-    @test_throws MethodError cr(CartesianIndices((5, 3, 2)))
-end
-if VERSION < v"0.7.0-DEV.880"
-    # ensure we don't bork any non-updated expressions
-    let
-        @compat cr(::CartesianRange{CartesianIndex{2}}) = 2
-        @test cr(CartesianRange((5, 3))) == 2
-        @test_throws MethodError cr(CartesianRange((5, 3, 2)))
-    end
-end
-
 # 0.7
 let A = [1]
     local x = 0