fixup! fixup! Add SeqSet and SetFromMap implementations

dynamic `className` impl using `collectionClassName`

Author: NthPortal

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

@@ -20,12 +20,11 @@ private class SetFromMap[A](protected[collection] val underlying: Map[A, Unit])
     extends AbstractSet[A]
     with SetFromMapOps.Unknown[A, Map, Map[A, Unit], SetFromMap, SetFromMap[A]]
     with SetFromMapOps.Unsorted[A, Map, SetFromMap]
+    with SetFromMapOps.DynamicClassName
     with IterableFactoryDefaults[A, SetFromMap]
     with DefaultSerializable {
   protected[this] def fromMap[B](m: Map[B, Unit]): SetFromMap[B] = new SetFromMap(m)
 
-  override protected[this] def className: String = "SetFromMap"
-
   override def iterableFactory: IterableFactory[SetFromMap] =
     new SetFromMap.WrapperFactory(underlying.mapFactory)
 }
@@ -48,13 +47,12 @@ private class SeqSetFromMap[A](protected[collection] val underlying: SeqMap[A, U
     extends AbstractSet[A]
     with SetFromMapOps.Unknown[A, SeqMap, SeqMap[A, Unit], SeqSetFromMap, SeqSetFromMap[A]]
     with SetFromMapOps.Unsorted[A, SeqMap, SeqSetFromMap]
+    with SetFromMapOps.DynamicClassName
     with SeqSet[A]
     with IterableFactoryDefaults[A, SeqSetFromMap]
     with DefaultSerializable {
   protected[this] def fromMap[B](m: SeqMap[B, Unit]): SeqSetFromMap[B] = new SeqSetFromMap(m)
 
-  override protected[this] def className: String = "SeqSetFromMap"
-
   override def iterableFactory: IterableFactory[SeqSetFromMap] =
     new SeqSetFromMap.WrapperFactory(underlying.mapFactory)
 }
@@ -79,6 +77,7 @@ private class SortedSetFromMap[A](protected[collection] val underlying: SortedMa
 ) extends AbstractSet[A]
     with SetFromMapOps.Unknown[A, Map, SortedMap[A, Unit], Set, SortedSetFromMap[A]]
     with SetFromMapOps.Sorted[A, SortedMap, Set, SortedSetFromMap]
+    with SetFromMapOps.DynamicClassName
     with SortedSet[A]
     with SortedSetOps[A, SortedSetFromMap, SortedSetFromMap[A]]
     with IterableFactoryDefaults[A, Set]
@@ -89,8 +88,6 @@ private class SortedSetFromMap[A](protected[collection] val underlying: SortedMa
   protected[this] def fromSortedMap[B: Ordering](m: SortedMap[B, Unit]): SortedSetFromMap[B] =
     new SortedSetFromMap(m)
 
-  override protected[this] def className: String = "SortedSetFromMap"
-
   override def iterableFactory: IterableFactory[Set] = SetFromMap(underlying.mapFactory)
 
   override def sortedIterableFactory: SortedIterableFactory[SortedSetFromMap] =

src/main/scala/scala/collection/SetFromMapOps.scala

@@ -196,6 +196,12 @@ object SetFromMapOps {
     protected[collection] val underlying: IterableOnce[(A, Unit)]
   }
 
+  trait DynamicClassName { self: Iterable[_] =>
+    protected[collection] val underlying: Iterable[_]
+
+    override protected[this] def className: String = s"SetFrom_${underlying.collectionClassName}"
+  }
+
   // unknown whether mutable or immutable
   trait Unknown[
       A,

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

@@ -46,12 +46,11 @@ object SetFromMapOps {
 private class SetFromMap[A](protected[collection] val underlying: Map[A, Unit])
     extends AbstractSet[A]
     with SetFromMapOps.Unsorted[A, Map, SetFromMap]
+    with collection.SetFromMapOps.DynamicClassName
     with IterableFactoryDefaults[A, SetFromMap]
     with DefaultSerializable {
   protected[this] def fromMap[B](m: Map[B, Unit]): SetFromMap[B] = new SetFromMap(m)
 
-  override protected[this] def className: String = "SetFromMap"
-
   override def iterableFactory: IterableFactory[SetFromMap] =
     new SetFromMap.WrapperFactory(underlying.mapFactory)
 }
@@ -73,14 +72,13 @@ private object SetFromMap extends SetFromMapMetaFactory[Map, Set] {
 private class SeqSetFromMap[A](protected[collection] val underlying: SeqMap[A, Unit])
     extends AbstractSet[A]
     with SetFromMapOps.Unsorted[A, SeqMap, SeqSetFromMap]
+    with collection.SetFromMapOps.DynamicClassName
     with SeqSet[A]
     with IterableFactoryDefaults[A, SeqSetFromMap]
     with DefaultSerializable {
   protected[this] def fromMap[B](m: SeqMap[B, Unit]): SeqSetFromMap[B] =
     new SeqSetFromMap(m)
 
-  override protected[this] def className: String = "SeqSetFromMap"
-
   override def iterableFactory: IterableFactory[SeqSetFromMap] =
     new SeqSetFromMap.WrapperFactory(underlying.mapFactory)
 }
@@ -105,6 +103,7 @@ private class SortedSetFromMap[A](protected[collection] val underlying: SortedMa
 ) extends AbstractSet[A]
     with SetFromMapOps[A, Map, SortedMap[A, Unit], Set, SortedSetFromMap[A]]
     with collection.SetFromMapOps.Sorted[A, SortedMap, Set, SortedSetFromMap]
+    with collection.SetFromMapOps.DynamicClassName
     with SortedSet[A]
     with SortedSetOps[A, SortedSetFromMap, SortedSetFromMap[A]]
     with IterableFactoryDefaults[A, Set]
@@ -118,8 +117,6 @@ private class SortedSetFromMap[A](protected[collection] val underlying: SortedMa
   protected[this] def fromSortedMap[B: Ordering](m: SortedMap[B, Unit]): SortedSetFromMap[B] =
     new SortedSetFromMap(m)
 
-  override protected[this] def className: String = "SortedSetFromMap"
-
   override def iterableFactory: IterableFactory[Set] = SetFromMap(underlying.mapFactory)
 
   override def sortedIterableFactory: SortedIterableFactory[SortedSetFromMap] =

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

@@ -53,12 +53,11 @@ private[collection] class SetFromMap[A](protected[collection] val underlying: Ma
     extends AbstractSet[A]
     with SetFromMapOps[A, Map, Map[A, Unit], SetFromMap, SetFromMap[A]]
     with SetFromMapOps.Unsorted[A, Map, SetFromMap]
+    with SetFromMapOps.DynamicClassName
     with IterableFactoryDefaults[A, SetFromMap]
     with DefaultSerializable {
   protected[this] def fromMap[B](m: Map[B, Unit]): SetFromMap[B] = new SetFromMap(m)
 
-  override protected[this] def className: String = "SetFromMap"
-
   override def iterableFactory: IterableFactory[SetFromMap] = SetFromMap(underlying.mapFactory)
 }
 
@@ -80,13 +79,12 @@ private class SeqSetFromMap[A](protected[collection] val underlying: SeqMap[A, U
     extends AbstractSet[A]
     with SetFromMapOps[A, SeqMap, SeqMap[A, Unit], SeqSetFromMap, SeqSetFromMap[A]]
     with SetFromMapOps.Unsorted[A, SeqMap, SeqSetFromMap]
+    with SetFromMapOps.DynamicClassName
     with SeqSet[A]
     with IterableFactoryDefaults[A, SeqSetFromMap]
     with DefaultSerializable {
   protected[this] def fromMap[B](m: SeqMap[B, Unit]): SeqSetFromMap[B] = new SeqSetFromMap(m)
 
-  override protected[this] def className: String = "SeqSetFromMap"
-
   override def iterableFactory: IterableFactory[SeqSetFromMap] = SeqSetFromMap(
     underlying.mapFactory
   )
@@ -114,6 +112,7 @@ private class SortedSetFromMap[A](protected[collection] val underlying: SortedMa
 ) extends AbstractSet[A]
     with SetFromMapOps[A, Map, SortedMap[A, Unit], Set, SortedSetFromMap[A]]
     with SetFromMapOps.Sorted[A, SortedMap, Set, SortedSetFromMap]
+    with SetFromMapOps.DynamicClassName
     with SortedSet[A]
     with SortedSetOps[A, SortedSetFromMap, SortedSetFromMap[A]]
     with IterableFactoryDefaults[A, Set]
@@ -124,8 +123,6 @@ private class SortedSetFromMap[A](protected[collection] val underlying: SortedMa
   protected[this] def fromSortedMap[B: Ordering](m: SortedMap[B, Unit]): SortedSetFromMap[B] =
     new SortedSetFromMap(m)
 
-  override protected[this] def className: String = "SortedSetFromMap"
-
   override def iterableFactory: IterableFactory[SetFromMap] = SetFromMap(underlying.mapFactory)
 
   override def sortedIterableFactory: SortedIterableFactory[SortedSetFromMap] =