Skip to content

Commit 8e49d89

Browse files
committed
Drop compat code for tr from #614
1 parent 6df3863 commit 8e49d89

File tree

4 files changed

+4
-13
lines changed

4 files changed

+4
-13
lines changed

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,6 @@ Currently, the `@compat` macro supports the following syntaxes:
157157

158158
* `strwidth` and `charwidth` are now merged into `textwidth` ([#23667]).
159159

160-
* `trace` is now `tr`, available as `Compat.tr` ([#26365]).
161-
162160
* `Associative` is now `AbstractDict` ([#25012]).
163161

164162
* `indices` is now `axes` ([#25057]). This function is not exported from Compat to avoid

src/Compat.jl

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,11 @@ import Serialization
3333
import Statistics
3434
import Base: Fix2
3535
import Base64
36+
const tr = LinearAlgebra.tr
3637

3738

3839
include("compatmacro.jl")
3940

40-
# julia #26365
41-
@static if isdefined(LinearAlgebra, :tr)
42-
const tr = LinearAlgebra.tr
43-
else
44-
# 0.6
45-
const tr = LinearAlgebra.trace
46-
end
47-
4841
if VERSION < v"0.7.0-DEV.1930"
4942
# no textwidth definition in Base
5043
export textwidth

test/old.jl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,9 @@ module Test24361
165165
@test String(Compat.Base64.base64decode("SGVsbG8h")) == "Hello!"
166166
end
167167

168+
# julia#26365
169+
@test Compat.tr([1 2; 3 5]) == 6
170+
168171

169172
# tests of removed functionality (i.e. justs tests Base)
170173

test/runtests.jl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ if VERSION >= v"0.7"
3838
end
3939
end
4040

41-
# julia#26365
42-
@test Compat.tr([1 2; 3 5]) == 6
43-
4441
let
4542
x = view(1:10, 2:4)
4643
D = Diagonal(x)

0 commit comments

Comments
 (0)