diff options
Diffstat (limited to 'tests')
43 files changed, 151 insertions, 151 deletions
diff --git a/tests/neg/assignments.scala b/tests/neg/assignments.scala index 2f7db275a..951f9eca5 100644 --- a/tests/neg/assignments.scala +++ b/tests/neg/assignments.scala @@ -4,7 +4,7 @@ object assignments { var i = 0 a(i) = a(i) * 2 a(i+1) += 1 - + class C { var myX = 0 def x = myX @@ -12,10 +12,10 @@ object assignments { x = x + 1 x *= 2 - + x_= = 2 // should give missing arguments + reassignment to val } - + var c = new C import c._ // should give: prefix is not stable x = x + 1 diff --git a/tests/neg/patternUnsoundness.scala b/tests/neg/patternUnsoundness.scala index c13c13072..4620f6c7d 100644 --- a/tests/neg/patternUnsoundness.scala +++ b/tests/neg/patternUnsoundness.scala @@ -1,14 +1,14 @@ object patternUnsoundness extends App { - + class C[+T] - + case class D[S](_s: S) extends C[S] { var s: S = _s } - + val x = new D[String]("abc") val y: C[Object] = x - + y match { case d @ D(x) => d.s = new Integer(1) } diff --git a/tests/neg/tailcall/t6574.scala b/tests/neg/tailcall/t6574.scala index 59f3108ad..e81c8cd07 100644 --- a/tests/neg/tailcall/t6574.scala +++ b/tests/neg/tailcall/t6574.scala @@ -4,7 +4,7 @@ class Bad[X, Y](val v: Int) extends AnyVal { println("tail") } - @annotation.tailrec final def differentTypeArgs : Unit = { + @annotation.tailrec final def differentTypeArgs : Unit = { {(); new Bad[String, Unit](0)}.differentTypeArgs } } diff --git a/tests/neg/typedapply.scala b/tests/neg/typedapply.scala index c059418ac..b80281c9f 100644 --- a/tests/neg/typedapply.scala +++ b/tests/neg/typedapply.scala @@ -5,13 +5,13 @@ object typedapply { foo[Int](1, "abc") foo[Int, String, String](1, "abc") - + def bar(x: Int) = x - + bar[Int](1) - + def baz[X >: Y, Y <: String](x: X, y: Y) = (x, y) - + baz[Int, String](1, "abc") - + } diff --git a/tests/pending/pos/t6260a.scala b/tests/pending/pos/t6260a.scala index 194294e98..21b2fd43c 100644 --- a/tests/pending/pos/t6260a.scala +++ b/tests/pending/pos/t6260a.scala @@ -1,7 +1,7 @@ final class Option[+A](val value: A) extends AnyVal // Was: sandbox/test.scala:21: error: bridge generated for member method f: ()Option[A] in class Bar -// which overrides method f: ()Option[A] in class Foo" +// which overrides method f: ()Option[A] in class Foo" abstract class Foo[A] { def f(): Option[A] } class Bar[A] extends Foo[A] { def f(): Option[A] = ??? } diff --git a/tests/pending/pos/t7983.scala b/tests/pending/pos/t7983.scala index bae9f3333..fbeb7d3c5 100644 --- a/tests/pending/pos/t7983.scala +++ b/tests/pending/pos/t7983.scala @@ -1,15 +1,15 @@ package foo.bar.baz // the package nesting level material to this bug - + class DivergenceTest { - + trait ColumnBase[T] - + trait ShapeLevel trait Flat extends ShapeLevel trait Lower extends Flat - + class Shape2[Level <: ShapeLevel, -M, U] - + implicit final def columnBaseShape[Level >: Flat <: ShapeLevel, T, C <: ColumnBase[_]] (implicit ev: C <:< ColumnBase[T] ): Shape2[Level, C, T] = ??? @@ -19,12 +19,12 @@ class DivergenceTest { (implicit u1: Shape2[_ <: Level, M1, U1], u2: Shape2[_ <: Level, M2, U2] ): Shape2[Level, (M1,M2), (U1,U2)] = ??? - + def foo: Unit = { class Coffees extends ColumnBase[Int] - + def map1[F, T](f: F)(implicit shape: Shape2[_ <: Flat, F, T]) = ??? - + map1(((1, null: Coffees), 1)) map1(((null: Coffees, 1), 1)) // fails with implicit divergence error in 2.11.0-M6, works under 2.10.3 } diff --git a/tests/pending/pos/t7987/Test_2.scala b/tests/pending/pos/t7987/Test_2.scala index 5896fdb51..aaa21ec4c 100644 --- a/tests/pending/pos/t7987/Test_2.scala +++ b/tests/pending/pos/t7987/Test_2.scala @@ -1,12 +1,12 @@ -class C[T] { - def foo = 0 -} +class C[T] { + def foo = 0 +} object Test { - implicit def AnyToC[T](a: Any): C[T] = new C[T] + implicit def AnyToC[T](a: Any): C[T] = new C[T] // was: "macro not expanded" - Macro { - "".foo - () + Macro { + "".foo + () } } diff --git a/tests/pending/pos/t8023.scala b/tests/pending/pos/t8023.scala index 86824084e..502b5c55d 100644 --- a/tests/pending/pos/t8023.scala +++ b/tests/pending/pos/t8023.scala @@ -4,7 +4,7 @@ import language._ object Test { def foo = (null: Any) match { case a: A[k] => - // error: kinds of the type arguments (k) do not conform to the + // error: kinds of the type arguments (k) do not conform to the // expected kinds of the type parameters (type K) in class B. new B[k]() } diff --git a/tests/pending/pos/t8111.scala b/tests/pending/pos/t8111.scala index 7ec002c9b..3f0e766ce 100644 --- a/tests/pending/pos/t8111.scala +++ b/tests/pending/pos/t8111.scala @@ -7,16 +7,16 @@ trait T { foo((u: Unit) => ma) foo(0, (u: Any) => ma) apply () - // crash due to side effects on the onwer of the symbol in the + // crash due to side effects on the onwer of the symbol in the // qualifier or arguments of the application during an abandoned // names/defaults transform. The code type checkes because of // autp-tupling which promotes and empty parmater list to `(): Unit` foo((u: Any) => ma)() - + {{(u: Any) => ma}; this}.foo(0)() - + foo({def foo = ma; 0})() - + {def foo = ma; this}.foo(0)() } diff --git a/tests/pending/pos/t8301b.scala b/tests/pending/pos/t8301b.scala index 5641547c1..4dd39139d 100644 --- a/tests/pending/pos/t8301b.scala +++ b/tests/pending/pos/t8301b.scala @@ -2,18 +2,18 @@ trait Universe { type Name >: Null <: AnyRef with NameApi trait NameApi - + type TermName >: Null <: TermNameApi with Name trait TermNameApi extends NameApi } - + object Test extends App { val u: Universe = ??? import u._ - + val ScalaName: TermName = ??? locally { - + ??? match { case Test.ScalaName => ??? } @@ -25,7 +25,7 @@ object Test extends App { import ScalaName._ // both the pattern and import led to - // stable identifier required, but SN found. Note that value SN + // stable identifier required, but SN found. Note that value SN // is not stable because its type, Test.u.TermName, is volatile. val SN = ScalaName ??? match { diff --git a/tests/pending/pos/t8367.scala b/tests/pending/pos/t8367.scala index 9ac2ce7c2..f0c329211 100644 --- a/tests/pending/pos/t8367.scala +++ b/tests/pending/pos/t8367.scala @@ -2,10 +2,10 @@ package java.lang // SI-8367 shows something is wrong with primaryConstructor and it was made worse with the fix for SI-8192 // perhaps primaryConstructor should not return NoSymbol when isJavaDefined -// or, perhaps isJavaDefined should be refined (the package definition above is pretty sneaky) +// or, perhaps isJavaDefined should be refined (the package definition above is pretty sneaky) // also, why does this only happen for a (scala-defined!) class with this special name? // (there are a couple of others: CloneNotSupportedException,InterruptedException) class Throwable -// class CloneNotSupportedException +// class CloneNotSupportedException // class InterruptedException diff --git a/tests/pickling/Coder.scala b/tests/pickling/Coder.scala index 77bbd134c..6eb1ad55a 100644 --- a/tests/pickling/Coder.scala +++ b/tests/pickling/Coder.scala @@ -7,15 +7,15 @@ class Coder(words: List[String]) { private val mnemonics = Map( '2' -> "ABC", '3' -> "DEF", '4' -> "GHI", '5' -> "JKL", '6' -> "MNO", '7' -> "PQRS", '8' -> "TUV", '9' -> "WXYZ") - + ('1', "1") match { - case (digit, str) => true + case (digit, str) => true case _ => false } /** Invert the mnemonics map to give a map from chars 'A' ... 'Z' to '2' ... '9' */ - private val charCode0: Map[Char, Char] = mnemonics withFilter { + private val charCode0: Map[Char, Char] = mnemonics withFilter { case (digit, str) => true case _ => false } flatMap { x$1 => @@ -24,18 +24,18 @@ class Coder(words: List[String]) { } } - private val charCode: Map[Char, Char] = + private val charCode: Map[Char, Char] = for ((digit, str) <- mnemonics; ltr <- str) yield ltr -> digit /** Maps a word to the digit string it can represent */ private def wordCode(word: String): String = word map charCode /** A map from digit strings to the words that represent them */ - private val wordsForNum: Map[String, List[String]] = + private val wordsForNum: Map[String, List[String]] = words groupBy wordCode withDefaultValue Nil /** All ways to encode a number as a list of words */ - def encode(number: String): Set[List[String]] = + def encode(number: String): Set[List[String]] = if (number.isEmpty) Set(Nil) else { for { @@ -44,7 +44,7 @@ class Coder(words: List[String]) { rest <- encode(number drop splitPoint) } yield word :: rest }.toSet - + /** Maps a number to a list of all word phrases that can represent it */ def translate(number: String): Set[String] = encode(number) map (_ mkString " ") diff --git a/tests/pickling/Labels.scala b/tests/pickling/Labels.scala index 4a84175af..4373723a8 100644 --- a/tests/pickling/Labels.scala +++ b/tests/pickling/Labels.scala @@ -1,18 +1,18 @@ object Labels { def main(args: Array[String]): Unit = { var i = 10 - while(i>0) { + while(i>0) { var j = 0 while(j<i) { println(j+" " + i) j = j +1 - } + } i = i - 1} pattern(1) pattern(2) - pattern(3) + pattern(3) } - + def pattern(a: Int) = a match { case 1 if (a>0) => println("one") case t@2 => println("two" + t) diff --git a/tests/pickling/nameddefaults.scala b/tests/pickling/nameddefaults.scala index 671f14a07..20a0eae47 100644 --- a/tests/pickling/nameddefaults.scala +++ b/tests/pickling/nameddefaults.scala @@ -1,7 +1,7 @@ object nameddefaults { def foo(first: Int, second: Int = 2, third: Int = 3) = first + second - + var x = 1 var y = 2 @@ -12,7 +12,7 @@ object nameddefaults { foo(1) // named and missing arguments - + foo(first = 1, second = 3) foo(second = 3, first = 1) @@ -20,7 +20,7 @@ object nameddefaults { foo(first = 2, third = 3) foo(2, third = 3) - + // same but with non-idempotent expressions foo(first = x, second = y) @@ -30,11 +30,11 @@ object nameddefaults { foo(first = x, third = y) foo(x, third = y) - + // The same thing, but for classes - + class C(first: Int, second: Int = 2, third: Int = 3) {} - + new C(1, 2, 3) new C(1, 2) @@ -42,7 +42,7 @@ object nameddefaults { new C(1) // named and missing arguments - + new C(first = 1, second = 3) new C(second = 3, first = 1) @@ -50,7 +50,7 @@ object nameddefaults { new C(first = 2, third = 3) new C(2, third = 3) - + // same but with non-idempotent expressions new C(first = x, second = y) diff --git a/tests/pickling/selftypes.scala b/tests/pickling/selftypes.scala index 4bd0dd752..5180419d1 100644 --- a/tests/pickling/selftypes.scala +++ b/tests/pickling/selftypes.scala @@ -1,20 +1,20 @@ object selftypes { - + trait A { self: AB => - + type AA = List[this.BX] - + class AX - + } - + trait B { self: AB => - + type BB = AA - + class BX } - + class AB extends A with B -} +} diff --git a/tests/pos/Bridges.scala b/tests/pos/Bridges.scala index a7350d785..6c2115d7e 100644 --- a/tests/pos/Bridges.scala +++ b/tests/pos/Bridges.scala @@ -1,6 +1,6 @@ abstract class X[T]{ def go2(x:T)(y:T = x): T = y - def go: T + def go: T def go1(x: T) = x } diff --git a/tests/pos/Coder.scala b/tests/pos/Coder.scala index 77bbd134c..6eb1ad55a 100644 --- a/tests/pos/Coder.scala +++ b/tests/pos/Coder.scala @@ -7,15 +7,15 @@ class Coder(words: List[String]) { private val mnemonics = Map( '2' -> "ABC", '3' -> "DEF", '4' -> "GHI", '5' -> "JKL", '6' -> "MNO", '7' -> "PQRS", '8' -> "TUV", '9' -> "WXYZ") - + ('1', "1") match { - case (digit, str) => true + case (digit, str) => true case _ => false } /** Invert the mnemonics map to give a map from chars 'A' ... 'Z' to '2' ... '9' */ - private val charCode0: Map[Char, Char] = mnemonics withFilter { + private val charCode0: Map[Char, Char] = mnemonics withFilter { case (digit, str) => true case _ => false } flatMap { x$1 => @@ -24,18 +24,18 @@ class Coder(words: List[String]) { } } - private val charCode: Map[Char, Char] = + private val charCode: Map[Char, Char] = for ((digit, str) <- mnemonics; ltr <- str) yield ltr -> digit /** Maps a word to the digit string it can represent */ private def wordCode(word: String): String = word map charCode /** A map from digit strings to the words that represent them */ - private val wordsForNum: Map[String, List[String]] = + private val wordsForNum: Map[String, List[String]] = words groupBy wordCode withDefaultValue Nil /** All ways to encode a number as a list of words */ - def encode(number: String): Set[List[String]] = + def encode(number: String): Set[List[String]] = if (number.isEmpty) Set(Nil) else { for { @@ -44,7 +44,7 @@ class Coder(words: List[String]) { rest <- encode(number drop splitPoint) } yield word :: rest }.toSet - + /** Maps a number to a list of all word phrases that can represent it */ def translate(number: String): Set[String] = encode(number) map (_ mkString " ") diff --git a/tests/pos/Labels.scala b/tests/pos/Labels.scala index d82287313..a2271461d 100644 --- a/tests/pos/Labels.scala +++ b/tests/pos/Labels.scala @@ -5,18 +5,18 @@ import dotty.tools.dotc.ast.tpd._ object Labels { def main(args: Array[String]): Unit = { var i = 10 - while(i>0) { + while(i>0) { var j = 0 while(j<i) { println(j+" " + i) j = j +1 - } + } i = i - 1} pattern(1) pattern(2) - pattern(3) + pattern(3) } - + def pattern(a: Int) = a match { case 1 if (a>0) => println("one") case t@2 => println("two" + t) diff --git a/tests/pos/assignments.scala b/tests/pos/assignments.scala index 94223b62c..93abbde20 100644 --- a/tests/pos/assignments.scala +++ b/tests/pos/assignments.scala @@ -4,7 +4,7 @@ object assignments { var i = 0 a(i) = a(i) * 2 a(i+1) += 1 - + class C { var myX = 0 def x = myX @@ -13,11 +13,11 @@ object assignments { x = x + 1 x *= 2 } - + var c = new C c.x =c.x + 1 c.x *= 2 - + val cc = c import cc._ x = x + 1 diff --git a/tests/pos/blockescapes.scala b/tests/pos/blockescapes.scala index 0b6a3ca03..589953fe5 100644 --- a/tests/pos/blockescapes.scala +++ b/tests/pos/blockescapes.scala @@ -1,11 +1,11 @@ object blockescapes { - + { val x = 0; () } val x0 = { class Foo; new Foo } val x1 = {} var x2 = { val z = 0 } val m1 = { val x = 2; x } - + trait T def m0: T = { object Foo { class Bar extends T } ; new Foo.Bar } } diff --git a/tests/pos/implicits1.scala b/tests/pos/implicits1.scala index 47b7f1c52..d8ca76de5 100644 --- a/tests/pos/implicits1.scala +++ b/tests/pos/implicits1.scala @@ -43,7 +43,7 @@ object Implicits { val e: Int = z.foo(true) // Haoyi Li's example on scala-user: - + trait Modifier implicit def stringNode(v: String): Modifier = new Modifier {} diff --git a/tests/pos/nameddefaults.scala b/tests/pos/nameddefaults.scala index 671f14a07..20a0eae47 100644 --- a/tests/pos/nameddefaults.scala +++ b/tests/pos/nameddefaults.scala @@ -1,7 +1,7 @@ object nameddefaults { def foo(first: Int, second: Int = 2, third: Int = 3) = first + second - + var x = 1 var y = 2 @@ -12,7 +12,7 @@ object nameddefaults { foo(1) // named and missing arguments - + foo(first = 1, second = 3) foo(second = 3, first = 1) @@ -20,7 +20,7 @@ object nameddefaults { foo(first = 2, third = 3) foo(2, third = 3) - + // same but with non-idempotent expressions foo(first = x, second = y) @@ -30,11 +30,11 @@ object nameddefaults { foo(first = x, third = y) foo(x, third = y) - + // The same thing, but for classes - + class C(first: Int, second: Int = 2, third: Int = 3) {} - + new C(1, 2, 3) new C(1, 2) @@ -42,7 +42,7 @@ object nameddefaults { new C(1) // named and missing arguments - + new C(first = 1, second = 3) new C(second = 3, first = 1) @@ -50,7 +50,7 @@ object nameddefaults { new C(first = 2, third = 3) new C(2, third = 3) - + // same but with non-idempotent expressions new C(first = x, second = y) diff --git a/tests/pos/packageobject.scala b/tests/pos/packageobject.scala index e88069755..b49a8489a 100644 --- a/tests/pos/packageobject.scala +++ b/tests/pos/packageobject.scala @@ -1,5 +1,5 @@ package test { - object `package` {} + object `package` {} } package object foo {} diff --git a/tests/pos/selftypes.scala b/tests/pos/selftypes.scala index 4bd0dd752..5180419d1 100644 --- a/tests/pos/selftypes.scala +++ b/tests/pos/selftypes.scala @@ -1,20 +1,20 @@ object selftypes { - + trait A { self: AB => - + type AA = List[this.BX] - + class AX - + } - + trait B { self: AB => - + type BB = AA - + class BX } - + class AB extends A with B -} +} diff --git a/tests/pos/sigs.scala b/tests/pos/sigs.scala index 4af4bda90..a9a1b464e 100644 --- a/tests/pos/sigs.scala +++ b/tests/pos/sigs.scala @@ -1,31 +1,31 @@ object sigs { - + type Lst[A] = List[A] - + type Twin[B] = (B, B) - + var x = 7 * 9 - + class Base { - + def foo(x: Int): Any = 33 def foo: Object = "x" - + } - + class Sub extends Base { - + override def foo = "abc" - + override def foo(x: Int) = "abc" } - + trait A { self: B => type AA val a: AA & BB - + } - + trait B { this: A => type BB val b: AA & BB diff --git a/tests/pos/templateParents.scala b/tests/pos/templateParents.scala index 845913270..1bc07b571 100644 --- a/tests/pos/templateParents.scala +++ b/tests/pos/templateParents.scala @@ -1,11 +1,11 @@ object templateParents { // traits do not call a constructor - class C[+T](x: T) + class C[+T](x: T) trait D extends C[String] trait E extends C[Int] new C("abc") with D - + } object templateParents1 { diff --git a/tests/untried/neg-with-implicits/t7519-b/Mac_1.scala b/tests/untried/neg-with-implicits/t7519-b/Mac_1.scala index 55b583d24..a9ecfd976 100644 --- a/tests/untried/neg-with-implicits/t7519-b/Mac_1.scala +++ b/tests/untried/neg-with-implicits/t7519-b/Mac_1.scala @@ -9,6 +9,6 @@ object IW { } object Mac { def mac(s: String): String = macro macImpl - def macImpl(c: Context)(s: c.Expr[String]): c.Expr[String] = + def macImpl(c: Context)(s: c.Expr[String]): c.Expr[String] = c.universe.reify(IW.foo(s.splice)) } diff --git a/tests/untried/neg/literate_existentials.scala b/tests/untried/neg/literate_existentials.scala index 8580347bf..fe47bd5fb 100644 --- a/tests/untried/neg/literate_existentials.scala +++ b/tests/untried/neg/literate_existentials.scala @@ -54,7 +54,7 @@ object LiterateExistentials { // V1 <: Any // // Which simplify to: -// V1 >: String <: Any +// V1 >: String <: Any // // That's not inconsistent, so we can say that: // T <: U forSome { type X1 >: L1 <: H1 } @@ -62,7 +62,7 @@ object LiterateExistentials { // Nothing <: A forSome { type A >: String <: Any } // Now to ask the compiler: - + implicitly[Nothing <:< (A forSome { type A >: String <: Any })] @@ -85,15 +85,15 @@ object LiterateExistentials { // // Which simplify to: // -// V1 >: lub(Int, String) <: Any +// V1 >: lub(Int, String) <: Any // -// V1 >: Any <: Any +// V1 >: Any <: Any // // We have demonstrated consistency! We can say that: // T :< (U forSome { type U >: L1 <: H1 }) // Under our bindings, this is: // Int :< (M forSome { type M >: String <: Any }) - + implicitly[Int <:< (M forSome { type M >: String <: Any })] @@ -179,7 +179,7 @@ object LiterateExistentials { // Nothing <: V1 // V1 <: String // -// V1 >: Int <: String +// V1 >: Int <: String // // Alas! These are inconsistent! There is no supertype of Int that is a // subtype of String! Our substitution rule does not allow us to claim that our diff --git a/tests/untried/neg/t0764.scala b/tests/untried/neg/t0764.scala index 7ee76feab..0c3f857a8 100644 --- a/tests/untried/neg/t0764.scala +++ b/tests/untried/neg/t0764.scala @@ -29,7 +29,7 @@ _1.type <:< Node{type T = NextType} (because skolemization and _1's upper bound) Node{type T = NextType} <:< _1.type forSome val _1: Node{type T = NextType} because: Node{type T = NextType} <:< T forSome {type T <: Node{type T = NextType} with Singleton} -because +because Node{type T = NextType} <:< Node{type T = NextType} with Singleton hmmm.. might the with Singleton be throwing a wrench in our existential house? diff --git a/tests/untried/neg/t2066b.scala b/tests/untried/neg/t2066b.scala index aebf761fc..b309a48d6 100644 --- a/tests/untried/neg/t2066b.scala +++ b/tests/untried/neg/t2066b.scala @@ -11,6 +11,6 @@ object Test extends App { val p = new P(1) val palias = (new B():A).f[P](p) - palias.y = "hello" + palias.y = "hello" val z: Int = p.y } diff --git a/tests/untried/neg/t7872.scala b/tests/untried/neg/t7872.scala index 66d22a071..55480be6a 100644 --- a/tests/untried/neg/t7872.scala +++ b/tests/untried/neg/t7872.scala @@ -1,7 +1,7 @@ trait Cov[+A] trait Inv[-A] -object varianceExploit { +object varianceExploit { type l[-a] = Cov[a] type x = {type l[-a] = Cov[a]} def foo[M[_]] = () diff --git a/tests/untried/neg/t7872b.scala b/tests/untried/neg/t7872b.scala index 307a1470c..e76145cce 100644 --- a/tests/untried/neg/t7872b.scala +++ b/tests/untried/neg/t7872b.scala @@ -1,20 +1,20 @@ object coinv { def up[F[+_]](fa: F[String]): F[Object] = fa def down[F[-_]](fa: F[Object]): F[String] = fa - + up(List("hi")) - + // should not compile; `l' is unsound def oops1 = down[({type l[-a] = List[a]})#l](List('whatever: Object)).head + "oops" // scala> oops1 // java.lang.ClassCastException: scala.Symbol cannot be cast to java.lang.String // at com.nocandysw.coinv$.oops1(coinv.scala:12) - + type Stringer[-A] = A => String down[Stringer](_.toString) // [error] type A is contravariant, but type _ is declared covariant // up[Stringer]("printed: " + _) - + // should not compile; `l' is unsound def oops2 = up[({type l[+a] = Stringer[a]})#l]("printed: " + _) // scala> oops2(Some(33)) diff --git a/tests/untried/neg/t7872c.scala b/tests/untried/neg/t7872c.scala index fa12a523b..112248bc8 100644 --- a/tests/untried/neg/t7872c.scala +++ b/tests/untried/neg/t7872c.scala @@ -1,7 +1,7 @@ object coinv { def up[F[+_]](fa: F[String]): F[Object] = fa def down[F[-_]](fa: F[Object]): F[String] = fa - + up(List("hi")) // [error] type A is covariant, but type _ is declared contravariant down(List('whatever: Object)) diff --git a/tests/untried/pos/SI-4012-a.scala b/tests/untried/pos/SI-4012-a.scala index 7fceeea3c..8ce8e5691 100644 --- a/tests/untried/pos/SI-4012-a.scala +++ b/tests/untried/pos/SI-4012-a.scala @@ -4,4 +4,4 @@ trait C1[+A] { trait C2[@specialized +A] extends C1[A] { override def head: A = super.head } -class C3 extends C2[Char] +class C3 extends C2[Char] diff --git a/tests/untried/pos/SI-4012-b.scala b/tests/untried/pos/SI-4012-b.scala index 6bc859276..102019463 100644 --- a/tests/untried/pos/SI-4012-b.scala +++ b/tests/untried/pos/SI-4012-b.scala @@ -3,13 +3,13 @@ trait Super[@specialized(Int) A] { } object Sub extends Super[Int] { - // it is expected that super[Super].superb crashes, since + // it is expected that super[Super].superb crashes, since // specialization does parent class rewiring, and the super // of Sub becomes Super$mcII$sp and not Super. But I consider // this normal behavior -- if you want, I can modify duplicatiors // to make this work, but I consider it's best to keep this // let the user know Super is not the superclass anymore. // super[Super].superb - Vlad - super.superb // okay + super.superb // okay override def superb: Int = super.superb // okay } diff --git a/tests/untried/pos/t8046.scala b/tests/untried/pos/t8046.scala index 304d70b6b..9beb0b9d1 100644 --- a/tests/untried/pos/t8046.scala +++ b/tests/untried/pos/t8046.scala @@ -2,13 +2,13 @@ trait One { type Op[A] type Alias[A] = Op[A] } - + trait Two extends One { trait Op[A] extends (A => A) - + // This compiles class View1 extends Op[Int] { def apply(xs: Int) = xs } - + // ??? base class View2 not found in basetypes of class View2 // ./a.scala:9: error: class View2 needs to be abstract, since \ // method apply in trait Function1 of type (v1: T1)R is not defined diff --git a/tests/untried/pos/t8046b.scala b/tests/untried/pos/t8046b.scala index 45b99fd7e..99d06b7e0 100644 --- a/tests/untried/pos/t8046b.scala +++ b/tests/untried/pos/t8046b.scala @@ -2,14 +2,14 @@ trait One { type Op[A] type Alias = Op[Int] } - + trait Two extends One { trait Op[A] extends M[A] //(a: Alias) => a.value.toChar // okay // (=> A).asSeenFrom(a.type, trait M): => Int class View2 extends Alias { value.toChar } // toChar is not a member of type parameter A // (=> A).asSeenFrom(View2.this.type, trait M): => A - + // override type Alias = Op[Int] // works with this } diff --git a/tests/untried/pos/t8060.scala b/tests/untried/pos/t8060.scala index 90e014d74..24881b60e 100644 --- a/tests/untried/pos/t8060.scala +++ b/tests/untried/pos/t8060.scala @@ -1,10 +1,10 @@ trait M[F[_]] - + trait P[A] { type CC[X] = P[X] def f(p: A => Boolean): M[CC] } - + trait Other { // was infinite loop trying to dealias `x$1.CC` def g[A](p: A => Boolean): P[A] => M[P] = _ f p diff --git a/tests/untried/pos/t8170.scala b/tests/untried/pos/t8170.scala index 1991da72f..fe9f262ba 100644 --- a/tests/untried/pos/t8170.scala +++ b/tests/untried/pos/t8170.scala @@ -22,6 +22,6 @@ this = {AliasArgsTypeRef@3004}"Test#7680.a#14899.T#14823[O#7702.X#7793]" info = namer: [F#14824 <: O#7703.X#7793]F#14824 result = {AbstractNoArgsTypeRef@3237}"F#24451" tp = {PolyType@3235}"[F#14824 <: O#7703.X#7793]F#14824" -tparams = +tparams = (0) = {AbstractTypeSymbol@3247}"type F#24451" */ diff --git a/tests/untried/pos/t8170b.scala b/tests/untried/pos/t8170b.scala index 53036f6c8..e3d1d33d9 100644 --- a/tests/untried/pos/t8170b.scala +++ b/tests/untried/pos/t8170b.scala @@ -13,13 +13,13 @@ object ScalaZeee { type Folded[N[X] >: M[X], U, F <: HFold[N, U]] <: U } } - + object TypelevelUsage { import ScalaZeee._ type T = GenericCons[Some, String, KNil.type] val klist1: T = ??? type T2 = klist1.Folded[Option, Int, HFold[Option, Int]] val count2: T2 = ??? - + count2.ensuring(x => true).toChar // trigger an implicit search } diff --git a/tests/untried/pos/t8315.scala b/tests/untried/pos/t8315.scala index 2f7742ed6..f56cfda7a 100644 --- a/tests/untried/pos/t8315.scala +++ b/tests/untried/pos/t8315.scala @@ -2,11 +2,11 @@ object Test { def crash(as: Listt): Unit = { map(as, (_: Any) => return) } - + final def map(x: Listt, f: Any => Any): Any = { if (x eq Nill) "" else f("") } } - + object Nill extends Listt class Listt diff --git a/tests/untried/pos/t8363.scala b/tests/untried/pos/t8363.scala index 639faf412..aecb8e4dc 100644 --- a/tests/untried/pos/t8363.scala +++ b/tests/untried/pos/t8363.scala @@ -1,5 +1,5 @@ class C(a: Any) -class Test { +class Test { def foo: Any = { def form = 0 class C1 extends C(() => form) diff --git a/tests/untried/pos/t8376/Test.scala b/tests/untried/pos/t8376/Test.scala index ba078a353..9440d76fa 100644 --- a/tests/untried/pos/t8376/Test.scala +++ b/tests/untried/pos/t8376/Test.scala @@ -5,6 +5,6 @@ class Test { } object BindingsY { - def select1(root: String, steps: String*) = () + def select1(root: String, steps: String*) = () def select1(root: Any, steps: String*) = () } |