Skip to content

Commit 2c001f0

Browse files
committed
Mark Compat.rmul! from #546 for deprecation
1 parent 430e42d commit 2c001f0

File tree

4 files changed

+9
-36
lines changed

4 files changed

+9
-36
lines changed

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,6 @@ Currently, the `@compat` macro supports the following syntaxes:
7878

7979
* `fetch` for `Task`s ([#25940]).
8080

81-
* `Compat.rmul!` provides a subset of the functionality of `LinearAlgebra.rmul!` for
82-
use with Julia 0.6 ([#25701], [#25812]).
83-
8481
* `isbits(t::Type)` is now `isbitstype(t)` ([#26850]).
8582

8683
* `something` to get the first argument different from `nothing`, unwrapping those

src/Compat.jl

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ import InteractiveUtils
5252
import LibGit2
5353
import UUIDs
5454
using LinearAlgebra: qr
55+
using LinearAlgebra: rmul!
5556

5657

5758
include("compatmacro.jl")
@@ -77,31 +78,6 @@ end
7778
end
7879
end
7980

80-
# rmul! (NOTE: Purposefully not exported)
81-
if VERSION < v"0.7.0-DEV.3563" # scale! not deprecated
82-
if VERSION >= v"0.7.0-DEV.3449" # LinearAlgebra in the stdlib
83-
using LinearAlgebra: UnitUpperTriangular, UnitLowerTriangular, scale!
84-
else
85-
using Base.LinAlg: UnitUpperTriangular, UnitLowerTriangular, scale!
86-
end
87-
const Triangle = Union{UpperTriangular, UnitUpperTriangular,
88-
LowerTriangular, UnitLowerTriangular}
89-
if VERSION < v"0.7.0-DEV.3204" # A_mul_B! not deprecated
90-
rmul!(A::AbstractMatrix, B::Triangle) = A_mul_B!(A, A, B)
91-
else
92-
rmul!(A::AbstractMatrix, B::Triangle) = mul!(A, A, B)
93-
end
94-
rmul!(A::AbstractArray, s::Number) = scale!(A, s)
95-
rmul!(A::AbstractMatrix, D::Diagonal) = scale!(A, D.diag)
96-
rmul!(A::Diagonal, B::Diagonal) = Diagonal(A.diag .*= B.diag)
97-
rmul!(A::Triangle, B::Diagonal) = typeof(A)(rmul!(A.data, B))
98-
elseif v"0.7.0-DEV.3563" <= VERSION < v"0.7.0-DEV.3665" # scale! -> mul1!
99-
using LinearAlgebra: mul1!
100-
const rmul! = mul1!
101-
elseif VERSION >= v"0.7.0-DEV.3665" # mul1! -> rmul!
102-
using LinearAlgebra: rmul!
103-
end
104-
10581
@static if VERSION < v"0.7.0-DEV.3936"
10682
Base.fetch(t::Task) = wait(t)
10783
end

test/old.jl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,14 @@ let A = [1 2; 1 2; 1 2]
242242
@test f.Q * [f.R; [0 0]] A[:,f.p]
243243
end
244244

245+
let A = [1 2; 3 4]
246+
@test Compat.rmul!(A, 2) == [2 4; 6 8]
247+
@test Compat.rmul!(A, Diagonal([1, 2])) == [2 8; 6 16]
248+
@test Compat.rmul!(A, UpperTriangular([2 2; 3 3])) == [4 28; 12 60]
249+
@test Compat.rmul!(LowerTriangular(A), Diagonal([1, 2])) == LowerTriangular([4 0; 12 120])
250+
@test Compat.rmul!(Diagonal(A), Diagonal([2, 1])) == Diagonal([8, 120])
251+
end
252+
245253

246254
# tests of removed functionality (i.e. justs tests Base)
247255

test/runtests.jl

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,6 @@ end
8282

8383
@test codeunit("foo") == codeunit(SubString("fooαβγ",1,3)) == UInt8
8484

85-
let A = [1 2; 3 4]
86-
@test Compat.rmul!(A, 2) == [2 4; 6 8]
87-
@test Compat.rmul!(A, Diagonal([1, 2])) == [2 8; 6 16]
88-
@test Compat.rmul!(A, UpperTriangular([2 2; 3 3])) == [4 28; 12 60]
89-
@test Compat.rmul!(LowerTriangular(A), Diagonal([1, 2])) == LowerTriangular([4 0; 12 120])
90-
@test Compat.rmul!(Diagonal(A), Diagonal([2, 1])) == Diagonal([8, 120])
91-
end
92-
9385
# 0.7.0-DEV.3936
9486
@test let ct = current_task(), t = @task true
9587
schedule(ct)

0 commit comments

Comments
 (0)