Skip to content

Commit 721c52c

Browse files
committed
update tests
1 parent 222f61a commit 721c52c

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

Compiler/test/inference.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3537,9 +3537,9 @@ _alloftype(ofdesiredtype, accumulated) = ofdesiredtype, Base.front(accumulated)
35373537
let
35383538
d = MixedKeyDict((Dict(1 => 3), Dict(4. => 2)))
35393539
e = MixedKeyDict((Dict(1 => 7), Dict(5. => 9)))
3540-
@test merge(+, d, e).dicts == (Dict(1 => 10), Dict(4.0 => 2, 5.0 => 9))
3540+
@test mergewith(+, d, e).dicts == (Dict(1 => 10), Dict(4.0 => 2, 5.0 => 9))
35413541
f = MixedKeyDict((Dict(2 => 7), Dict(5. => 11)))
3542-
@test merge(+, d, e, f).dicts == (Dict(1 => 10, 2 => 7), Dict(4.0 => 2, 5.0 => 20))
3542+
@test mergewith(+, d, e, f).dicts == (Dict(1 => 10, 2 => 7), Dict(4.0 => 2, 5.0 => 20))
35433543
end
35443544

35453545
# Issue #31974

test/dict.jl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,8 +1289,6 @@ struct NonFunctionCallable end
12891289
@test @inferred mergewith(NonFunctionCallable(), d1, d2) == Dict("A" => 1, "B" => 5, "C" => 4)
12901290
@test foldl(mergewith(+), [d1, d2]; init=Dict{Union{},Union{}}()) ==
12911291
Dict("A" => 1, "B" => 5, "C" => 4)
1292-
# backward compatibility
1293-
@test @inferred merge(+, d1, d2) == Dict("A" => 1, "B" => 5, "C" => 4)
12941292
end
12951293

12961294
@testset "Dict merge!" begin

0 commit comments

Comments
 (0)