diff options
Diffstat (limited to 'tests/pos')
-rw-r--r-- | tests/pos/jon.scala | 2 | ||||
-rw-r--r-- | tests/pos/range.scala | 4 | ||||
-rw-r--r-- | tests/pos/t2613.scala | 2 | ||||
-rw-r--r-- | tests/pos/tycons.scala | 22 |
4 files changed, 4 insertions, 26 deletions
diff --git a/tests/pos/jon.scala b/tests/pos/jon.scala index d4ea74f02..224486945 100644 --- a/tests/pos/jon.scala +++ b/tests/pos/jon.scala @@ -4,5 +4,5 @@ object Test { val x = List(List, Vector) - val y: List[scala.collection.generic.SeqFactory] = x + val y: List[scala.collection.generic.SeqFactory[_]] = x } diff --git a/tests/pos/range.scala b/tests/pos/range.scala index 9e7b5d1c9..a33f7fcee 100644 --- a/tests/pos/range.scala +++ b/tests/pos/range.scala @@ -1,8 +1,8 @@ import scala.math._ import collection.immutable.NumericRange object Test { - val r1: scala.collection.immutable.Range.Partial = ??? - val r2: scala.Range.Partial = r1 + val r1: scala.collection.immutable.Range.Partial[_, _] = ??? + val r2: scala.Range.Partial[_, _] = r1 def until(d: BigDecimal, end: BigDecimal): Range.Partial[BigDecimal, NumericRange.Exclusive[BigDecimal]] = new Range.Partial(until(d, end, _)) def until(d: BigDecimal, end: BigDecimal, step: BigDecimal) = Range.BigDecimal(d, end, step) diff --git a/tests/pos/t2613.scala b/tests/pos/t2613.scala index c234d4c0d..17ebe2d7e 100644 --- a/tests/pos/t2613.scala +++ b/tests/pos/t2613.scala @@ -5,7 +5,7 @@ object Test { abstract class MyRelation [R <: Row, +Relation <: MyRelation[R, Relation]] - type M = MyRelation[_ <: Row, _ <: MyRelation] + type M = MyRelation[_ <: Row, _ <: MyRelation[_, _]] val (x,y): (String, M) = null } diff --git a/tests/pos/tycons.scala b/tests/pos/tycons.scala deleted file mode 100644 index 1ed4d2855..000000000 --- a/tests/pos/tycons.scala +++ /dev/null @@ -1,22 +0,0 @@ -class TypeConstructor { - type TypeArg -} - -trait List[+T] extends TypeConstructor { type TypeArg <: T } - -trait Set[T] extends TypeConstructor { type TypeArg <: T } - -object obj extends List[Number] with Set[Exception] { - val x: TypeArg = ??? - val n: Number = x - val e: Exception = x -} - -abstract class Functor[F <: TypeConstructor] { - def map[A, B](f: F { type TypeArg <: A }): F { type TypeArg <: B } -} - -object ListFunctor extends Functor[List] { - override def map[A, B](f: List { type TypeArg <: A }): List { type TypeArg <: B } = ??? -} - |