Drop compat code for Val(n) and ntuple/reshape with Val from #…

…381 and #399

README.md

@@ -120,10 +120,6 @@ Currently, the `@compat` macro supports the following syntaxes:
 
 * `isnothing` for testing if a variable is equal to `nothing` ([#29674]).
 
-* `Val(x)` constructs `Val{x}()`. ([#22475])
-
-* The `reshape` and `ntuple` APIs are extended to support `Val{x}()` arguments on 0.6 and below.
-
 * `logdet` for `Number`s ([#22629]).
 
 * `fieldcount` is equivalent to `nfields` for Julia versions 0.6 and below and is used to

src/Compat.jl

@@ -14,17 +14,6 @@ import Base.invokelatest
 
 include("compatmacro.jl")
 
-# https://github.com/JuliaLang/julia/pull/22475
-@static if VERSION < v"0.7.0-DEV.843"
-    import Base: Val
-    (::Type{Val})(x) = (Base.@_pure_meta; Val{x}())
-    # Also add methods for Val(x) that were previously Val{x}
-    import Base: reshape
-    reshape{N}(parent::AbstractArray, ndims::Val{N}) = reshape(parent, Val{N})
-    import Base: ntuple
-    ntuple{F,N}(f::F, ::Val{N}) = ntuple(f, Val{N})
-end
-
 # https://github.com/JuliaLang/julia/pull/22629
 if VERSION < v"0.7.0-DEV.848"
     import Base: logdet

test/old.jl

@@ -130,3 +130,38 @@ let c = `ls -l "foo bar"`
     @test length(c) == 3
     @test eachindex(c) == 1:3
 end
+
+# Val(x)
+# 0.7
+begin
+    local firstlast
+    firstlast(::Val{true}) = "First"
+    firstlast(::Val{false}) = "Last"
+
+    @test firstlast(Val(true)) == "First"
+    @test firstlast(Val(false)) == "Last"
+end
+
+# Reshape to a given number of dimensions using Val(N)
+# 0.7
+let
+    for A in (rand(Float64, ()), rand(2), rand(2,3), rand(2,3,5), rand(2,3,5,7)), N in (1,2,3,4,5,6)
+        B = @inferred reshape(A, Val(N))
+        @test ndims(B) == N
+        if N < ndims(A)
+            new_sz = (size(A)[1:N-1]..., prod(size(A)[N:end]))
+        elseif N == ndims(A)
+            new_sz = size(A)
+        else
+            new_sz = (size(A)..., ntuple(x->1, N-ndims(A))...)
+        end
+        @test size(B) == new_sz
+        @test B == reshape(A, new_sz)
+    end
+end
+
+# ntuple with Val(N)
+# 0.7
+@test @inferred(ntuple(x->1, Val(3))) == (1,1,1)
+@test @inferred(ntuple(x->x, Val(0))) == ()
+@test @inferred(ntuple(x->x, Val(5))) == (1,2,3,4,5)

test/runtests.jl

@@ -138,41 +138,6 @@ let
     @test vec([b for (a,b) in pairs(IndexCartesian(), A14)]) == [11,12,13,14]
 end
 
-# Val(x)
-# 0.7
-begin
-    local firstlast
-    firstlast(::Val{true}) = "First"
-    firstlast(::Val{false}) = "Last"
-
-    @test firstlast(Val(true)) == "First"
-    @test firstlast(Val(false)) == "Last"
-end
-
-# Reshape to a given number of dimensions using Val(N)
-# 0.7
-let
-    for A in (rand(Float64, ()), rand(2), rand(2,3), rand(2,3,5), rand(2,3,5,7)), N in (1,2,3,4,5,6)
-        B = @inferred reshape(A, Val(N))
-        @test ndims(B) == N
-        if N < ndims(A)
-            new_sz = (size(A)[1:N-1]..., prod(size(A)[N:end]))
-        elseif N == ndims(A)
-            new_sz = size(A)
-        else
-            new_sz = (size(A)..., ntuple(x->1, N-ndims(A))...)
-        end
-        @test size(B) == new_sz
-        @test B == reshape(A, new_sz)
-    end
-end
-
-# ntuple with Val(N)
-# 0.7
-@test @inferred(ntuple(x->1, Val(3))) == (1,1,1)
-@test @inferred(ntuple(x->x, Val(0))) == ()
-@test @inferred(ntuple(x->x, Val(5))) == (1,2,3,4,5)
-
 # 0.7
 @test read(IOBuffer("aaaa"), String) == "aaaa"
 @test occursin("read(@__FILE__, String)", read(@__FILE__, String))