File tree 3 files changed +17
-2
lines changed
scala-2.11/scala/collection/compat
scala-2.12/scala/collection/compat
test/scala/test/scala/collection
3 files changed +17
-2
lines changed Original file line number Diff line number Diff line change 12
12
13
13
package scala .collection
14
14
15
- import scala .collection .generic .IsTraversableLike
15
+ import scala .collection .generic .{ CanBuildFrom , GenericOrderedCompanion , IsTraversableLike }
16
16
import scala .{collection => c }
17
17
18
18
package object compat extends compat.PackageShared {
19
+ implicit def genericOrderedCompanionToCBF [A , CC [X ] <: Traversable [X ]](
20
+ fact : GenericOrderedCompanion [CC ])(
21
+ implicit ordering : Ordering [A ]): CanBuildFrom [Any , A , CC [A ]] =
22
+ CompatImpl .simpleCBF(fact.newBuilder[A ])
23
+
19
24
implicit def toTraversableLikeExtensionMethods [Repr ](self : Repr )(
20
25
implicit traversable : IsTraversableLike [Repr ])
21
26
: TraversableLikeExtensionMethods [traversable.A , Repr ] =
Original file line number Diff line number Diff line change 12
12
13
13
package scala .collection
14
14
15
- import scala .collection .generic .IsTraversableLike
15
+ import scala .collection .generic .{ CanBuildFrom , GenericOrderedCompanion , IsTraversableLike }
16
16
import scala .{collection => c }
17
17
import scala .collection .{mutable => m }
18
18
@@ -27,6 +27,11 @@ package object compat extends compat.PackageShared {
27
27
build(m.SortedMap .newBuilder[K , V ], source)
28
28
}
29
29
30
+ implicit def genericOrderedCompanionToCBF [A , CC [X ] <: Traversable [X ]](
31
+ fact : GenericOrderedCompanion [CC ])(
32
+ implicit ordering : Ordering [A ]): CanBuildFrom [Any , A , CC [A ]] =
33
+ CompatImpl .simpleCBF(fact.newBuilder[A ])
34
+
30
35
implicit def toTraversableLikeExtensionMethods [Repr ](self : Repr )(
31
36
implicit traversable : IsTraversableLike [Repr ])
32
37
: TraversableLikeExtensionMethods [traversable.A , Repr ] =
Original file line number Diff line number Diff line change @@ -17,6 +17,7 @@ import org.junit.Test
17
17
18
18
import scala .collection .compat ._
19
19
import scala .collection .immutable .BitSet
20
+ import scala .collection .mutable .PriorityQueue
20
21
import scala .collection .LinearSeq
21
22
22
23
class CollectionTest {
@@ -35,6 +36,10 @@ class CollectionTest {
35
36
val bT : BitSet = b
36
37
assertEquals(BitSet (1 , 2 , 3 ), b)
37
38
39
+ val c = xs.to(PriorityQueue )
40
+ val cT : PriorityQueue [Int ] = c
41
+ assert(PriorityQueue (1 , 2 , 3 ) sameElements c)
42
+
38
43
val ys = List (1 -> " a" , 2 -> " b" )
39
44
val m = ys.to(Map )
40
45
// Not possible - `to` returns a Col[A] so this is only typed as an Iterable[(Int, String)]
You can’t perform that action at this time.
0 commit comments