Skip to content

Commit c343eff

Browse files
committed
Some fixes from review
1 parent fd0281e commit c343eff

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

library/src/scala/collection/Factory.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ object EvidenceIterableFactory {
534534
class Delegate[CC[_], Ev[_]](delegate: EvidenceIterableFactory[CC, Ev]) extends EvidenceIterableFactory[CC, Ev] {
535535
override def apply[A: Ev](xs: A*): CC[A] = delegate.apply(xs: _*)
536536
def empty[A : Ev]: CC[A] = delegate.empty
537-
def from[E : Ev](it: IterableOnce[E]^) = delegate.from(it)
537+
def from[E : Ev](it: IterableOnce[E]^): CC[E] = delegate.from(it)
538538
def newBuilder[A : Ev]: Builder[A, CC[A]] = delegate.newBuilder[A]
539539
}
540540
}

library/src/scala/collection/Map.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ transparent trait MapOps[K, +V, +CC[_, _] <: IterableOps[_, AnyConstr, _], +C]
135135
/** Similar to `fromIterable`, but returns a Map collection type.
136136
* Note that the return type is now `CC[K2, V2]`.
137137
*/
138-
@`inline` protected def mapFromIterable[K2, V2](it: Iterable[(K2, V2)]^): CC[K2, V2]^{it} = mapFactory.from(it)
138+
@`inline` protected final def mapFromIterable[K2, V2](it: Iterable[(K2, V2)]^): CC[K2, V2]^{it} = mapFactory.from(it)
139139

140140
/** The companion object of this map, providing various factory methods.
141141
*

library/src/scala/collection/MapView.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ object MapView extends MapViewFactory {
8888
override def knownSize: Int = 0
8989
override def isEmpty: Boolean = true
9090
override def filterKeys(p: Any => Boolean): MapView[Any, Nothing] = this
91-
override def mapValues[W](f: Nothing => W): MapView[Any, W] = this
91+
override def mapValues[W](f: Nothing => W): MapView[Any, Nothing] = this
9292
override def filter(pred: ((Any, Nothing)) => Boolean): MapView[Any, Nothing] = this
9393
override def filterNot(pred: ((Any, Nothing)) => Boolean): MapView[Any, Nothing] = this
9494
override def partition(p: ((Any, Nothing)) => Boolean): (MapView[Any, Nothing], MapView[Any, Nothing]) = (this, this)

library/src/scala/collection/immutable/StrictOptimizedSeqOps.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import scala.collection.generic.CommonErrors
2121

2222
/** Trait that overrides operations to take advantage of strict builders.
2323
*/
24-
transparent trait StrictOptimizedSeqOps[+A, +CC[B] <: collection.SeqOps[B, collection.Seq, collection.Seq[B]] & caps.Pure, +C]
24+
transparent trait StrictOptimizedSeqOps[+A, +CC[B] <: caps.Pure, +C]
2525
extends Any
2626
with SeqOps[A, CC, C]
2727
with collection.StrictOptimizedSeqOps[A, CC, C]

0 commit comments

Comments
 (0)