Skip to content

Commit 4aa6b7a

Browse files
committed
Test reorg
1 parent 27cd90f commit 4aa6b7a

File tree

19 files changed

+59
-62
lines changed

19 files changed

+59
-62
lines changed

test/dotc/tests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class tests extends CompilerTest {
8383
@Test def neg_autoTupling2 = compileFile(negDir, "autoTuplingTest", xerrors = 4)
8484
@Test def neg_companions = compileFile(negDir, "companions", xerrors = 1)
8585
@Test def neg_over = compileFile(negDir, "over", xerrors = 1)
86-
@Test def neg_overrides = compileFile(negDir, "overrides", xerrors = 7)
86+
@Test def neg_overrides = compileFile(negDir, "overrides", xerrors = 8)
8787
@Test def neg_projections = compileFile(negDir, "projections", xerrors = 1)
8888
@Test def neg_i39 = compileFile(negDir, "i39", xerrors = 1)
8989
@Test def neg_i50_volatile = compileFile(negDir, "i50-volatile", xerrors = 4)

tests/pending/pos/t3363-new.scala renamed to tests/disabled/structural-type/pos/t3363-new.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ object TestCase {
77

88
//if fs was reduced to List (generic type with one parameter) then the code compiles
99
//if you inherit from MapOps[T] instead of MapOps[F] then code compiles fine
10-
implicit def map2ops[T,F](fs: Map[T,F]): TestCase.MapOps[F]{lazy val m: reflect.runtime.universe.TypeTag[T]; def is(xs: List[T]): List[List[T]]} = new MapOps[F] {
10+
implicit def map2ops[T,F](fs: Map[T,F]): TestCase.MapOps[F]{val m: reflect.runtime.universe.TypeTag[T]; def is(xs: List[T]): List[List[T]]} = new MapOps[F] {
1111
//if you remove this line, then code compiles
1212
lazy val m: TypeTag[T] = sys.error("just something to make it compile")
1313
def is(xs: List[T]) = List(xs)

tests/pending/pos/t3363-old.scala renamed to tests/disabled/structural-type/pos/t3363-old.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ object TestCase {
55

66
//if fs was reduced to List (generic type with one parameter) then the code compiles
77
//if you inherit from MapOps[T] instead of MapOps[F] then code compiles fine
8-
implicit def map2ops[T,F](fs: Map[T,F]): TestCase.MapOps[F]{lazy val m: Manifest[T]; def is(xs: List[T]): List[List[T]]} = new MapOps[F] {
8+
implicit def map2ops[T,F](fs: Map[T,F]): TestCase.MapOps[F]{val m: Manifest[T]; def is(xs: List[T]): List[List[T]]} = new MapOps[F] {
99
//if you remove this line, then code compiles
1010
lazy val m: Manifest[T] = sys.error("just something to make it compile")
1111
def is(xs: List[T]) = List(xs)

tests/neg/overrides.scala

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,24 @@ class Y2 extends X2 {
7979
class X3 {
8080
override type T = A1
8181
}
82+
83+
package p3 {
84+
85+
// Dotty change of rules: Toverrider#f does not
86+
// override TCommon#f, hence the accidental override rule
87+
// applies.
88+
trait TCommon {
89+
def f: String
90+
}
91+
92+
class C1 extends TCommon {
93+
def f = "in C1"
94+
}
95+
96+
trait TOverrider { this: TCommon =>
97+
override def f = "in TOverrider" // The overridden self-type member...
98+
}
99+
100+
class C2 extends C1 with TOverrider // ... fails to override, here.
101+
102+
}

tests/pending/pos/self-type-override.scala

Lines changed: 0 additions & 13 deletions
This file was deleted.

tests/pending/pos/t3278.scala

Lines changed: 0 additions & 15 deletions
This file was deleted.

tests/pending/pos/t3480.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
object Test {
2-
val List(_*) = List(1)
2+
val List(_: _*) = List(1)
33
val Array( who, what : _* ) = "Eclipse plugin cannot not handle this" split (" ")
44
}
File renamed without changes.

0 commit comments

Comments
 (0)