diff options
| -rw-r--r-- | test/dotc/tests.scala | 6 | ||||
| -rw-r--r-- | tests/neg/i50-volatile.scala | 2 | ||||
| -rw-r--r-- | tests/neg/singletons.scala | 2 | ||||
| -rw-r--r-- | tests/neg/typers.scala | 2 | ||||
| -rw-r--r-- | tests/pos/i566.scala | 2 | ||||
| -rw-r--r-- | tests/pos/tycons.scala | 2 | ||||
| -rw-r--r-- | tests/run/classTags.scala | 5 |
7 files changed, 10 insertions, 11 deletions
diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala index 89687d16c..7674b1d6f 100644 --- a/test/dotc/tests.scala +++ b/test/dotc/tests.scala @@ -105,7 +105,7 @@ class tests extends CompilerTest { @Test def neg_typedapply() = compileFile(negDir, "typedapply", xerrors = 4) @Test def neg_typedidents() = compileFile(negDir, "typedIdents", xerrors = 2) @Test def neg_assignments() = compileFile(negDir, "assignments", xerrors = 3) - @Test def neg_typers() = compileFile(negDir, "typers", xerrors = 13)(allowDoubleBindings) + @Test def neg_typers() = compileFile(negDir, "typers", xerrors = 14)(allowDoubleBindings) @Test def neg_privates() = compileFile(negDir, "privates", xerrors = 2) @Test def neg_rootImports = compileFile(negDir, "rootImplicits", xerrors = 2) @Test def neg_templateParents() = compileFile(negDir, "templateParents", xerrors = 3) @@ -135,7 +135,7 @@ class tests extends CompilerTest { @Test def neg_badAuxConstr = compileFile(negDir, "badAuxConstr", xerrors = 2) @Test def neg_typetest = compileFile(negDir, "typetest", xerrors = 1) @Test def neg_t1569_failedAvoid = compileFile(negDir, "t1569-failedAvoid", xerrors = 1) - @Test def neg_clashes = compileFile(negDir, "clashes", xerrors = 2) + @Test def neg_clashes = compileFile(negDir, "clashes", xerrors = 3) @Test def neg_cycles = compileFile(negDir, "cycles", xerrors = 8) @Test def neg_boundspropagation = compileFile(negDir, "boundspropagation", xerrors = 5) @Test def neg_refinedSubtyping = compileFile(negDir, "refinedSubtyping", xerrors = 2) @@ -150,7 +150,7 @@ class tests extends CompilerTest { @Test def neg_instantiateAbstract = compileFile(negDir, "instantiateAbstract", xerrors = 8) @Test def neg_selfInheritance = compileFile(negDir, "selfInheritance", xerrors = 6) @Test def neg_selfreq = compileFile(negDir, "selfreq", xerrors = 4) - @Test def neg_singletons = compileFile(negDir, "singletons", xerrors = 5) + @Test def neg_singletons = compileFile(negDir, "singletons", xerrors = 8) @Test def neg_shadowedImplicits = compileFile(negDir, "arrayclone-new", xerrors = 2) @Test def neg_traitParamsTyper = compileFile(negDir, "traitParamsTyper", xerrors = 5) @Test def neg_traitParamsMixin = compileFile(negDir, "traitParamsMixin", xerrors = 2) diff --git a/tests/neg/i50-volatile.scala b/tests/neg/i50-volatile.scala index ae31a764c..9098b47d6 100644 --- a/tests/neg/i50-volatile.scala +++ b/tests/neg/i50-volatile.scala @@ -1,4 +1,4 @@ -object Test { +class Test { class Base { class Inner } diff --git a/tests/neg/singletons.scala b/tests/neg/singletons.scala index 5dff13096..2155bfe31 100644 --- a/tests/neg/singletons.scala +++ b/tests/neg/singletons.scala @@ -5,7 +5,7 @@ object Test { val n: null = null // error: Null is not a legal singleton type - val sym: 'sym = 'sym // error: Symbol is a legal singleton type + val sym: 'sym = 'sym // error: Symbol is not a legal singleton type val foo: s"abc" = "abc" // error: not a legal singleton type } diff --git a/tests/neg/typers.scala b/tests/neg/typers.scala index 8bd39a557..537c4cdb0 100644 --- a/tests/neg/typers.scala +++ b/tests/neg/typers.scala @@ -30,7 +30,7 @@ object typers { } type L[X] = scala.collection.immutable.List[X] - type M[X, Y] <: scala.collection.immutable.Map[X, Y] + type M[X, Y] <: scala.collection.immutable.Map[X, Y] // error: only classes can have declared but undefined members object hk { def f(x: L) // error: missing type parameter diff --git a/tests/pos/i566.scala b/tests/pos/i566.scala index 34d25f8f2..a0e6f2fe7 100644 --- a/tests/pos/i566.scala +++ b/tests/pos/i566.scala @@ -1,4 +1,4 @@ -object Test { +class Test { type T = String type U reflect.classTag[T] diff --git a/tests/pos/tycons.scala b/tests/pos/tycons.scala index ef16a7792..1ed4d2855 100644 --- a/tests/pos/tycons.scala +++ b/tests/pos/tycons.scala @@ -16,7 +16,7 @@ abstract class Functor[F <: TypeConstructor] { def map[A, B](f: F { type TypeArg <: A }): F { type TypeArg <: B } } -implicit object ListFunctor extends Functor[List] { +object ListFunctor extends Functor[List] { override def map[A, B](f: List { type TypeArg <: A }): List { type TypeArg <: B } = ??? } diff --git a/tests/run/classTags.scala b/tests/run/classTags.scala index 9af6747f3..d0bd1c0ee 100644 --- a/tests/run/classTags.scala +++ b/tests/run/classTags.scala @@ -1,6 +1,5 @@ -object Test { +object Test { type T = String - type U /* val a /* : Class[T] */ = classOf[T] // [Ljava/lang/String; println(a) @@ -14,7 +13,7 @@ object Test { val f /* : ClassTag[Array[T with U]] */ = reflect.classTag[Array[T with U]] // ClassTag(arrayClass(classOf[java.lang.String])) println(f) val g /* : Class[Meter] */ = classOf[Meter] // [LMeter; - println(g) + println(g) val h /* : ClassTag[Meter] */ = reflect.classTag[Meter] // ClassTag(classOf[Meter]) println(h) */ |