Merge pull request #16 from tkoolen/nightly

tkoolen · web-flow · commit 1c2bef250b21 · 2017-12-04T16:02:54.000-05:00
Use Compat.Test instead of Base.Test, adapt to JuliaLang/julia#22825
diff --git a/REQUIRE b/REQUIRE
@@ -1,2 +1,2 @@
 julia 0.6
-Compat 0.27 # for Val constructor
+Compat 0.33 # for Compat.Test
diff --git a/src/TypeSortedCollections.jl b/src/TypeSortedCollections.jl
@@ -181,7 +181,7 @@ end
 @generated function Base.mapreduce(f, op, v0, tsc::TypeSortedCollection{<:Any, N}) where {N}
     expr = Expr(:block)
     push!(expr.args, :(Base.@_inline_meta))
-    push!(expr.args, :(ret = Base.r_promote(op, v0)))
+    push!(expr.args, :(ret = v0))
     for i = 1 : N
         push!(expr.args, quote
             let vec = tsc.data[$i]
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,4 +1,4 @@
-using Base.Test
+using Compat.Test
 using TypeSortedCollections
 
 module M

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using Base.Test`
	`1`	`+using Compat.Test`
`2`	`2`	`using TypeSortedCollections`
`3`	`3`
`4`	`4`	`module M`