Skip to content

Commit ef21a75

Browse files
committed
implement review
1 parent abe9480 commit ef21a75

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

compat/src/main/scala-2.11_2.12/scala/collection/compat/PackageShared.scala

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,7 @@ private[compat] trait PackageShared {
5757

5858
implicit def genericOrderedCompanionToCBF[A, CC[X] <: Traversable[X]](
5959
fact: GenericOrderedCompanion[CC])(implicit ordering: Ordering[A]): CanBuildFrom[Any, A, CC[A]] = {
60-
val builder: m.Builder[A, CC[A]] = fact match {
61-
case m.PriorityQueue => new IdentityPreservingBuilder[A, m.PriorityQueue](m.PriorityQueue.newBuilder[A])
62-
case _ => fact.newBuilder[A]
63-
}
64-
simpleCBF(builder)
60+
simpleCBF(fact.newBuilder[A])
6561
}
6662

6763
implicit def sortedSetCompanionToCBF[A: Ordering,

compat/src/test/scala/scala/jdk/CollectionConvertersTest.scala

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,6 @@ class CollectionConvertersTest {
8585
assert((s: m.Map[String, String]) == p) // not eq
8686
}
8787

88-
{
89-
val t: m.PriorityQueue[String] = it.to(m.PriorityQueue)
90-
assert((t: m.PriorityQueue[String]) eq t) // what should we test here?
91-
}
92-
9388
// Scala.js doesn't like the concurrent packages
9489
// {
9590
// val p: scala.collection.concurrent.Map[String, String] = scala.collection.concurrent.TrieMap(it.map(a => (a, a)).toSeq: _*)

compat/src/test/scala/test/scala/collection/CollectionTest.scala

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import org.junit.Test
1717

1818
import scala.collection.compat._
1919
import scala.collection.immutable.BitSet
20+
import scala.collection.mutable.PriorityQueue
2021
import scala.collection.LinearSeq
2122

2223
class CollectionTest {
@@ -35,6 +36,10 @@ class CollectionTest {
3536
val bT: BitSet = b
3637
assertEquals(BitSet(1, 2, 3), b)
3738

39+
val c = xs.to(PriorityQueue) // we can fake a type constructor for the 2 standard BitSet types
40+
val cT: PriorityQueue[Int] = c
41+
assert(PriorityQueue(1, 2, 3) sameElements c)
42+
3843
val ys = List(1 -> "a", 2 -> "b")
3944
val m = ys.to(Map)
4045
// Not possible - `to` returns a Col[A] so this is only typed as an Iterable[(Int, String)]

0 commit comments

Comments
 (0)