Skip to content

Commit 3dbcd57

Browse files
committed
Revert "broken tests -- for check file diffing ease"
This reverts commit 631b636, at least the part that masked actual breakage Currently failing tests: - test/files/pos/t6780.scala - test/files/neg/anytrait.scala - test/files/neg/delayed-init-ref.scala - test/files/neg/t562.scala - test/files/neg/t6276.scala - test/files/run/delambdafy_uncurry_byname_inline.scala - test/files/run/delambdafy_uncurry_byname_method.scala - test/files/run/delambdafy_uncurry_inline.scala - test/files/run/delambdafy_uncurry_method.scala - test/files/run/inner-obj-auto.scala - test/files/run/lazy-traits.scala - test/files/run/reify_lazyunit.scala - test/files/run/showraw_mods.scala - test/files/run/t3670.scala - test/files/run/t3980.scala - test/files/run/t4047.scala - test/files/run/t6622.scala - test/files/run/t7406.scala - test/files/run/t7843-jsr223-service.scala - test/files/jvm/innerClassAttribute - test/files/specialized/SI-7343.scala - test/files/specialized/constant_lambda.scala - test/files/specialized/spec-early.scala - test/files/specialized/spec-init.scala - test/files/specialized/spec-matrix-new.scala - test/files/specialized/spec-matrix-old.scala - test/files/presentation/scope-completion-3
1 parent 08cbc35 commit 3dbcd57

File tree

5 files changed

+14
-7
lines changed

5 files changed

+14
-7
lines changed

test/files/neg/anytrait.check

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1+
anytrait.scala:3: error: field definition is not allowed in universal trait extending from class Any
2+
var x = 1
3+
^
14
anytrait.scala:5: error: this statement is not allowed in universal trait extending from class Any
25
{ x += 1 }
36
^
4-
one error found
7+
two errors found

test/files/neg/delayed-init-ref.check

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ delayed-init-ref.scala:28: warning: trait DelayedInit in package scala is deprec
88
See the release notes for more details: https://github.com/scala/scala/releases/tag/v2.11.0-RC1
99
trait Before extends DelayedInit {
1010
^
11+
delayed-init-ref.scala:40: warning: Selecting value foo from trait UserContext, which extends scala.DelayedInit, is likely to yield an uninitialized value
12+
println({locally(()); this}.foo) // warn (spurious, but we can't discriminate)
13+
^
1114
error: No warnings can be incurred under -Xfatal-warnings.
12-
three warnings found
15+
four warnings found
1316
one error found

test/files/neg/t562.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
t562.scala:10: error: super may not be used on <none>
1+
t562.scala:10: error: super may not be used on value y
22
override val y = super.y;
33
^
44
one error found

test/files/neg/t6276.check

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
t6276.scala:4: warning: method a in class C does nothing other than call itself recursively
22
def a: Any = a // warn
33
^
4+
t6276.scala:5: warning: value b in class C does nothing other than call itself recursively
5+
val b: Any = b // warn
6+
^
47
t6276.scala:7: warning: method c in class C does nothing other than call itself recursively
58
def c: Any = this.c // warn
69
^
@@ -14,5 +17,5 @@ t6276.scala:22: warning: method a does nothing other than call itself recursivel
1417
def a = a // warn
1518
^
1619
error: No warnings can be incurred under -Xfatal-warnings.
17-
5 warnings found
20+
6 warnings found
1821
one error found

test/files/run/bugs.check

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ C
9191
>>> bug 396
9292

9393
<<< bug 399
94-
Exception in thread "Thread[main,5,main]" java.lang.AbstractMethodError: Bug399Test$G$1.Bug399Test$C$1$_setter_$x$1_$eq(Ljava/lang/String;)V
94+
a
9595
>>> bug 399
9696

97-
98-
1 error

0 commit comments

Comments
 (0)