summaryrefslogtreecommitdiff
path: root/src/library/scala/collection/immutable/Seq.scala
diff options
context:
space:
mode:
Diffstat (limited to 'src/library/scala/collection/immutable/Seq.scala')
-rw-r--r--src/library/scala/collection/immutable/Seq.scala6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/library/scala/collection/immutable/Seq.scala b/src/library/scala/collection/immutable/Seq.scala
index 0a370615fc..39b99e9e8b 100644
--- a/src/library/scala/collection/immutable/Seq.scala
+++ b/src/library/scala/collection/immutable/Seq.scala
@@ -23,14 +23,16 @@ import parallel.immutable.ParSeq
* @define coll immutable sequence
*/
trait Seq[+A] extends Iterable[A]
+ with GenSeq[A]
with scala.collection.Seq[A]
with GenericTraversableTemplate[A, Seq]
with SeqLike[A, Seq[A]]
- with Parallelizable[A, ParSeq[A]] {
+ with Parallelizable[A, ParSeq[A]]
+{
override def companion: GenericCompanion[Seq] = Seq
override def toSeq: Seq[A] = this
- protected[this] override def parCombiner = ParSeq.newCombiner[A] // if `immutable.SeqLike` gets introduced, please move this there!
override def seq: Seq[A] = this
+ protected[this] override def parCombiner = ParSeq.newCombiner[A] // if `immutable.SeqLike` gets introduced, please move this there!
}
/** $factoryInfo