Skip to content

Commit 023ba1b

Browse files
committed
fixup! Add SeqSet and SetFromMap implementations
tweak SeqSet inheritance order
1 parent 7aaae8b commit 023ba1b

File tree

4 files changed

+3
-5
lines changed

4 files changed

+3
-5
lines changed

src/main/scala/scala/collection/SetFromMap.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ private object SetFromMap extends SetFromMapMetaFactory[Map, Set] {
4646
@SerialVersionUID(3L)
4747
private class SeqSetFromMap[A](protected[collection] val underlying: SeqMap[A, Unit])
4848
extends AbstractSet[A]
49-
with SeqSet[A]
5049
with SetFromMapOps.Unknown[A, SeqMap, SeqMap[A, Unit], SeqSetFromMap, SeqSetFromMap[A]]
5150
with SetFromMapOps.Unsorted[A, SeqMap, SeqSetFromMap]
51+
with SeqSet[A]
5252
with IterableFactoryDefaults[A, SeqSetFromMap]
5353
with DefaultSerializable {
5454
protected[this] def fromMap[B](m: SeqMap[B, Unit]): SeqSetFromMap[B] = new SeqSetFromMap(m)

src/main/scala/scala/collection/concurrent/SetFromMap.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ private class SetFromMap[A](override protected[collection] val underlying: Map[A
2727
override protected[this] def fromMap[B](m: mutable.Map[B, Unit]): mutable.SetFromMap[B] =
2828
SetFromMap.fromMutableMap(m)
2929

30-
override protected[this] def className: String = "SetFromMap"
31-
3230
override def iterableFactory: IterableFactory[m.SetFromMap] =
3331
new SetFromMap.MutableFactory(underlying.mapFactory)
3432
}

src/main/scala/scala/collection/immutable/SetFromMap.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ private object SetFromMap extends SetFromMapMetaFactory[Map, Set] {
7272
@SerialVersionUID(3L)
7373
private class SeqSetFromMap[A](protected[collection] val underlying: SeqMap[A, Unit])
7474
extends AbstractSet[A]
75-
with SeqSet[A]
7675
with SetFromMapOps.Unsorted[A, SeqMap, SeqSetFromMap]
76+
with SeqSet[A]
7777
with IterableFactoryDefaults[A, SeqSetFromMap]
7878
with DefaultSerializable {
7979
protected[this] def fromMap[B](m: SeqMap[B, Unit]): SeqSetFromMap[B] =

src/main/scala/scala/collection/mutable/SetFromMap.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ private[collection] object SetFromMap extends SetFromMapMetaFactory[Map, Set] {
7878
@SerialVersionUID(3L)
7979
private class SeqSetFromMap[A](protected[collection] val underlying: SeqMap[A, Unit])
8080
extends AbstractSet[A]
81-
with SeqSet[A]
8281
with SetFromMapOps[A, SeqMap, SeqMap[A, Unit], SeqSetFromMap, SeqSetFromMap[A]]
8382
with SetFromMapOps.Unsorted[A, SeqMap, SeqSetFromMap]
83+
with SeqSet[A]
8484
with IterableFactoryDefaults[A, SeqSetFromMap]
8585
with DefaultSerializable {
8686
protected[this] def fromMap[B](m: SeqMap[B, Unit]): SeqSetFromMap[B] = new SeqSetFromMap(m)

0 commit comments

Comments
 (0)