aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2015-07-22 16:05:11 +0200
committerMartin Odersky <odersky@gmail.com>2015-09-18 18:12:17 +0200
commit154f3511d52c6b748c03d97dd035f0ad79f9a355 (patch)
tree242ad2ae186bbe5ed84adf69436d5bf810f540cb
parent5ee7b9ed189d77fbf864c5558841f53750db2c30 (diff)
downloaddotty-154f3511d52c6b748c03d97dd035f0ad79f9a355.tar.gz
dotty-154f3511d52c6b748c03d97dd035f0ad79f9a355.tar.bz2
dotty-154f3511d52c6b748c03d97dd035f0ad79f9a355.zip
Move failing test to pending.
The original IterableSelfRec is not syntactically legal after the hk changes. I attempted to fix, but there's still a type error. Need to investigate whether this is a true error or a bug.
-rw-r--r--tests/pending/pos/IterableSelfRec.scala (renamed from tests/pos/IterableSelfRec.scala)6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/pos/IterableSelfRec.scala b/tests/pending/pos/IterableSelfRec.scala
index bba7a82d2..a97833991 100644
--- a/tests/pos/IterableSelfRec.scala
+++ b/tests/pending/pos/IterableSelfRec.scala
@@ -22,9 +22,9 @@ trait Seq[T] extends Iterable[T] { self =>
def apply(x: Int): T
}
-abstract class CollectionCompanion[+CC <: Collection { type This <: CC }]
+abstract class CollectionCompanion[+CC[X] <: Collection[X] { type This <: CC }]
-abstract class IterableCompanion[+CC <: Iterable { type This <: CC }] extends CollectionCompanion[CC] {
+abstract class IterableCompanion[+CC[X] <: Iterable[X] { type This <: CC }] extends CollectionCompanion[CC] {
def fromIterator[T](it: Iterator[T]): CC[T]
def map[T, U](xs: Iterable[T], f: T => U): CC[U] =
fromIterator(xs.iterator.map(f))
@@ -36,7 +36,7 @@ abstract class IterableCompanion[+CC <: Iterable { type This <: CC }] extends Co
implicit def transformOps[T](xs: CC[T] @uncheckedVariance): TransformOps[CC, T] = ??? // new TransformOps[CC, T](xs)
}
-class TransformOps[+CC <: Iterable { type This <: CC }, T] (val xs: CC[T]) extends AnyVal {
+class TransformOps[+CC[X] <: Iterable[X] { type This <: CC }, T] (val xs: CC[T]) extends AnyVal {
def companion[T](xs: CC[T] @uncheckedVariance): IterableCompanion[CC] = xs.companion
def map[U](f: T => U): CC[U] = companion(xs).map(xs, f)
def filter(p: T => Boolean): CC[T] = companion(xs).filter(xs, p)