only overload diagonal/convert for ≤v1.11-

JuliaArrays · Aug 29, 2024 · 80b50c4 · 80b50c4
1 parent f6c723c
commit 80b50c4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/FillArrays.jl b/src/FillArrays.jl
@@ -554,11 +554,13 @@ for (Typ, funcs, func) in ((:AbstractZeros, :zeros, :zero), (:AbstractOnes, :one
     end
 end
 
-# temporary patch. should be a PR(#48895) to LinearAlgebra
-Diagonal{T}(A::AbstractFillMatrix) where T = Diagonal{T}(diag(A))
-function convert(::Type{T}, A::AbstractFillMatrix) where T<:Diagonal
-    checksquare(A)
-    isdiag(A) ? T(diag(A)) : throw(InexactError(:convert, T, A))
+if VERSION < v"1.11-"
+    # temporary patch. should be a PR(#48895) to LinearAlgebra
+    Diagonal{T}(A::AbstractFillMatrix) where T = Diagonal{T}(diag(A))
+    function convert(::Type{T}, A::AbstractFillMatrix) where T<:Diagonal
+        checksquare(A)
+        isdiag(A) ? T(diag(A)) : throw(InexactError(:convert, T, A))
+    end
 end
 
 Base.StepRangeLen(F::AbstractFillVector{T}) where T = StepRangeLen(getindex_value(F), zero(T), length(F))

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -2963,6 +2963,8 @@ end
 @testset "Diagonal conversion (#389)" begin
     @test convert(Diagonal{Int, Vector{Int}}, Zeros(5,5)) isa Diagonal{Int,Vector{Int}}
     @test convert(Diagonal{Int, Vector{Int}}, Zeros(5,5)) == zeros(5,5)
+    @test Diagonal{Int}(Zeros(5,5)) ≡ Diagonal(Zeros{Int}(5))
+    @test Diagonal{Int}(Ones(5,5)) ≡ Diagonal(Ones{Int}(5))
 end
 
 @testset "sqrt/cbrt" begin