Remove piracy of diagm (#475)

Author: oxinabox

Project.toml

@@ -1,6 +1,6 @@
 name = "ChainRulesCore"
 uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
-version = "1.7.0"
+version = "1.7.1"
 
 [deps]
 Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"

src/tangent_types/thunks.jl

@@ -59,12 +59,17 @@ LinearAlgebra.UpperTriangular(a::AbstractThunk) = UpperTriangular(unthunk(a))
 LinearAlgebra.Symmetric(a::AbstractThunk, uplo=:U) = Symmetric(unthunk(a), uplo)
 LinearAlgebra.Hermitian(a::AbstractThunk, uplo=:U) = Hermitian(unthunk(a), uplo)
 
-function LinearAlgebra.diagm(kv::Pair{<:Integer,<:AbstractThunk}...)
-    return diagm((k => unthunk(v) for (k, v) in kv)...)
+function LinearAlgebra.diagm(
+    kv::Pair{<:Integer,<:AbstractThunk}, kvs::Pair{<:Integer,<:AbstractThunk}...
+)
+    return diagm((k => unthunk(v) for (k, v) in (kv, kvs...))...)
 end
-function LinearAlgebra.diagm(m, n, kv::Pair{<:Integer,<:AbstractThunk}...)
-    return diagm(m, n, (k => unthunk(v) for (k, v) in kv)...)
+function LinearAlgebra.diagm(
+    m, n, kv::Pair{<:Integer,<:AbstractThunk}, kvs::Pair{<:Integer,<:AbstractThunk}...
+)
+    return diagm(m, n, (k => unthunk(v) for (k, v) in (kv, kvs...))...) 
 end
+
 LinearAlgebra.tril(a::AbstractThunk) = tril(unthunk(a))
 LinearAlgebra.tril(a::AbstractThunk, k) = tril(unthunk(a), k)
 LinearAlgebra.triu(a::AbstractThunk) = triu(unthunk(a))

test/tangent_types/thunks.jl

@@ -138,6 +138,10 @@
         if VERSION >= v"1.2"
             @test diagm(0 => v) == diagm(0 => tv)
             @test diagm(3, 4, 0 => v) == diagm(3, 4, 0 => tv)
+            # Check against accidential type piracy
+            # https://github.com/JuliaDiff/ChainRulesCore.jl/issues/472
+            @test Base.which(diagm, Tuple{}()).module != ChainRulesCore
+            @test Base.which(diagm, Tuple{Int, Int}).module != ChainRulesCore
         end
         @test tril(a) == tril(t)
         @test tril(a, 1) == tril(t, 1)