Skip to content

Commit b0938ab

Browse files
committed
fixup! Add SeqSet and SetFromMap implementations
tweak SeqSet linheritance order
1 parent 1109efa commit b0938ab

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

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

+1-1
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/immutable/SetFromMap.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ private object SetFromMap extends SetFromMapMetaFactory[Map, Set] {
7474
@SerialVersionUID(3L)
7575
private class SeqSetFromMap[A](protected[collection] val underlying: SeqMap[A, Unit])
7676
extends AbstractSet[A]
77-
with SeqSet[A]
7877
with SetFromMapOps.Unsorted[A, SeqMap, SeqSetFromMap]
78+
with SeqSet[A]
7979
with IterableFactoryDefaults[A, SeqSetFromMap]
8080
with DefaultSerializable {
8181
protected[this] def fromMap[B](m: SeqMap[B, Unit]): SeqSetFromMap[B] =

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ private[collection] object SetFromMap extends SetFromMapMetaFactory[Map, Set] {
7979
@SerialVersionUID(3L)
8080
private class SeqSetFromMap[A](protected[collection] val underlying: SeqMap[A, Unit])
8181
extends AbstractSet[A]
82-
with SeqSet[A]
8382
with SetFromMapOps[A, SeqMap, SeqMap[A, Unit], SeqSetFromMap, SeqSetFromMap[A]]
8483
with SetFromMapOps.Unsorted[A, SeqMap, SeqSetFromMap]
84+
with SeqSet[A]
8585
with IterableFactoryDefaults[A, SeqSetFromMap]
8686
with DefaultSerializable {
8787
protected[this] def fromMap[B](m: SeqMap[B, Unit]): SeqSetFromMap[B] = new SeqSetFromMap(m)

0 commit comments

Comments
 (0)