Fix StrictOptimizedSortedMapOps type parameter

Introduce an extra type parameter "UnsortedCC" to pass to
StrictOptimizedMapOps.

See scala/scala3#4839.

Author: smarter

src/library/scala/collection/StrictOptimizedSortedMapOps.scala

@@ -10,9 +10,9 @@ import scala.annotation.implicitNotFound
   * @tparam CC Collection type constructor
   * @tparam C  Collection type
   */
-trait StrictOptimizedSortedMapOps[K, +V, +CC[X, Y] <: Map[X, Y] with SortedMapOps[X, Y, CC, _], +C <: SortedMapOps[K, V, CC, C]]
+trait StrictOptimizedSortedMapOps[K, +V, +UnsortedCC[X, Y] <: Map[X, Y], +CC[X, Y] <: UnsortedCC[X, Y] with SortedMapOps[X, Y, CC, _], +C <: SortedMapOps[K, V, CC, C]]
   extends SortedMapOps[K, V, CC, C]
-    with StrictOptimizedMapOps[K, V, Map, C] {
+    with StrictOptimizedMapOps[K, V, UnsortedCC, C] {
 
   override def map[K2, V2](f: ((K, V)) => (K2, V2))(implicit @implicitNotFound(SortedMapOps.ordMsg) ordering: Ordering[K2]): CC[K2, V2] =
     strictOptimizedMap(sortedMapFactory.newBuilder, f)

src/library/scala/collection/immutable/TreeMap.scala

@@ -30,7 +30,7 @@ final class TreeMap[K, +V] private (tree: RB.Tree[K, V])(implicit val ordering:
     with SortedMap[K, V]
     with SortedMapOps[K, V, TreeMap, TreeMap[K, V]]
     with StrictOptimizedIterableOps[(K, V), Iterable, TreeMap[K, V]]
-    with StrictOptimizedSortedMapOps[K, V, TreeMap, TreeMap[K, V]] {
+    with StrictOptimizedSortedMapOps[K, V, Map, TreeMap, TreeMap[K, V]] {
 
   def this()(implicit ordering: Ordering[K]) = this(null)(ordering)
 

src/library/scala/collection/mutable/TreeMap.scala

@@ -23,7 +23,7 @@ sealed class TreeMap[K, V] private (tree: RB.Tree[K, V])(implicit val ordering:
     with SortedMap[K, V]
     with SortedMapOps[K, V, TreeMap, TreeMap[K, V]]
     with StrictOptimizedIterableOps[(K, V), Iterable, TreeMap[K, V]]
-    with StrictOptimizedSortedMapOps[K, V, TreeMap, TreeMap[K, V]] {
+    with StrictOptimizedSortedMapOps[K, V, Map, TreeMap, TreeMap[K, V]] {
 
   override def sortedMapFactory = TreeMap