diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-12-06 04:16:21 -0800 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-12-06 04:16:21 -0800 |
| commit | 49f7414a1ed42f00f0b5e703d01d0327eb103943 (patch) | |
| tree | c74365071ab2e9cfcf938d6c84a41e905b07bd25 /test/files/pos | |
| parent | 636307b9ba35e856f34684cce8620983aa1ba702 (diff) | |
| parent | 51cd47491e979b10b5d86992dd2e3efd08f7e214 (diff) | |
| download | scala-49f7414a1ed42f00f0b5e703d01d0327eb103943.tar.gz scala-49f7414a1ed42f00f0b5e703d01d0327eb103943.tar.bz2 scala-49f7414a1ed42f00f0b5e703d01d0327eb103943.zip | |
Merge pull request #3191 from retronym/ticket/deprecate-par-view
Remove parallel collection views and, with them, Gen*View
Diffstat (limited to 'test/files/pos')
| -rw-r--r-- | test/files/pos/specializes-sym-crash.scala | 6 | ||||
| -rw-r--r-- | test/files/pos/t4365/a_1.scala | 4 | ||||
| -rw-r--r-- | test/files/pos/t4365/b_1.scala | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/test/files/pos/specializes-sym-crash.scala b/test/files/pos/specializes-sym-crash.scala index c46f435ac4..7778ba277b 100644 --- a/test/files/pos/specializes-sym-crash.scala +++ b/test/files/pos/specializes-sym-crash.scala @@ -2,11 +2,11 @@ import scala.collection._ trait Foo[+A, +Coll, - +This <: GenSeqView[A, Coll] with GenSeqViewLike[A, Coll, This]] -extends GenSeq[A] with GenSeqLike[A, This] with GenIterableView[A, Coll] with GenIterableViewLike[A, Coll, This] { + +This <: SeqView[A, Coll] with SeqViewLike[A, Coll, This]] +extends Seq[A] with SeqLike[A, This] with IterableView[A, Coll] with IterableViewLike[A, Coll, This] { self => - trait Transformed[+B] extends GenSeqView[B, Coll] with super.Transformed[B] { + trait Transformed[+B] extends SeqView[B, Coll] with super.Transformed[B] { def length: Int def apply(idx: Int): B override def toString = viewToString diff --git a/test/files/pos/t4365/a_1.scala b/test/files/pos/t4365/a_1.scala index 6f3405b1ff..a24b57772d 100644 --- a/test/files/pos/t4365/a_1.scala +++ b/test/files/pos/t4365/a_1.scala @@ -2,8 +2,8 @@ import scala.collection._ trait SeqViewLike[+A, +Coll, - +This <: SeqView[A, Coll] with SeqViewLike[A, Coll, This]] - extends Seq[A] with GenSeqViewLike[A, Coll, This] + +This <: SeqView[A, Coll] with SeqViewLike[A, Coll, Nothing]] + extends Seq[A] with GenSeqViewLike[A, Coll, Nothing] { trait Transformed[+B] extends super[GenSeqViewLike].Transformed[B] diff --git a/test/files/pos/t4365/b_1.scala b/test/files/pos/t4365/b_1.scala index e5b5687185..e1423813f1 100644 --- a/test/files/pos/t4365/b_1.scala +++ b/test/files/pos/t4365/b_1.scala @@ -1,9 +1,11 @@ import scala.collection._ +trait GenSeqView0[+A, +Coll] + trait GenSeqViewLike[+A, +Coll, - +This <: GenSeqView[A, Coll] with GenSeqViewLike[A, Coll, This]] -extends GenSeq[A] { + +This <: GenSeqView0[A, Coll] with GenSeqViewLike[A, Coll, Nothing]] +extends GenSeq[A] { self => trait Transformed[+B] { |