Skip to content

Commit b6c00f2

Browse files
committed
Updated tests after fix of 20103
x-ref: JuliaLang/julia#20103
1 parent 9393f4a commit b6c00f2

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

test/runtests.jl

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,19 +82,16 @@ type C9<:A9 end
8282
# This will overwrite the definition def1 above
8383

8484
VERSION>=v"0.5" && VERSION<v"0.6-dev" && println("\nOne warning expected:")
85-
try # https://github.com/JuliaLang/julia/issues/20103
86-
@traitfn f{X; !Tr2{X,X}}(x::X) = 10
87-
end
88-
try # https://github.com/JuliaLang/julia/issues/20103
89-
@traitfn f{X; Tr2{X,X}}(x::X) = 100
90-
end
85+
@traitfn f{X; !Tr2{X,X}}(x::X) = 10
86+
@traitfn f{X; Tr2{X,X}}(x::X) = 100
9187
@test f(5)==10
9288
@test f(5.)==10
9389
@traitimpl Tr2{Integer, Integer}
9490
@test f(5.)==10
95-
if VERSION<v"0.6-dev"
91+
92+
# Needed to update method cache (but not in 0.6 as #265 got fixed):
93+
if VERSION<v"0.6-dev" # in
9694
@test !(f(5)==100)
97-
# needed to update method cache:
9895
VERSION>=v"0.5" && println("\nTwo warnings expected:")
9996
@traitfn f{X; Tr2{X,X}}(x::X) = 100
10097
println("")

0 commit comments

Comments
 (0)