Skip to content

Commit 9303e82

Browse files
authored
Merge pull request scala#6206 from lrytz/build-fix
Fix tests that failed due to -Xsource:2.13
2 parents 8272151 + 0e6bf9f commit 9303e82

12 files changed

+10
-139
lines changed

test/files/neg/t6895.check

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

test/files/neg/t6895.scala

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

test/files/neg/t6895b.check

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

test/files/neg/t7187-2.13.check

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
t7187-2.13.scala:3: error: type mismatch;
22
found : String
33
required: () => Any
4-
val f: () => Any = foo
4+
val f: () => Any = foo // error (not eta-expanded)
55
^
6-
one error found
6+
t7187-2.13.scala:5: error: type mismatch;
7+
found : String
8+
required: () => ?
9+
val h = foo _ // error (not eta-expanded)
10+
^
11+
two errors found

test/files/neg/t7187-2.13.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
class EtaExpandZeroArg {
22
def foo() = ""
3-
val f: () => Any = foo
3+
val f: () => Any = foo // error (not eta-expanded)
4+
val g: () => Any = foo _ // ok
5+
val h = foo _ // error (not eta-expanded)
46
}
File renamed without changes.

test/files/pos/t6895b-2.flags

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/files/pos/t6895b-2.scala

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

test/files/pos/t6895b.flags

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

test/files/pos/t6895b.scala

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

test/files/run/byname.check

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
warning: there were two deprecation warnings (since 2.12.0); re-run with -deprecation for details
21
test no braces completed properly
32
test no braces r completed properly
43
test plain completed properly
@@ -13,9 +12,6 @@ test varargs r completed properly
1312
test all completed properly
1413
test all r completed properly
1514
test all s completed properly
16-
test c00 completed properly
17-
test c00 r completed properly
18-
test c00 rr completed properly
1915
test cbb completed properly
2016
test cbb r completed properly
2117
test cbb rr completed properly

test/files/run/byname.scala

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,6 @@ test("all s", 8, testAllS(1, 5, 78, 89))
4949

5050
// test currying
5151

52-
def testC00()(): Int = 1
53-
test("c00", 1, testC00()())
54-
55-
val testC00R = testC00 _
56-
test("c00 r", 1, testC00R()())
57-
58-
val testC00RR = testC00() _
59-
test("c00 rr", 1, testC00RR())
60-
61-
6252
def testCBB(a: => Int)(b: => Int) = a + b
6353
test("cbb", 3, testCBB(1)(2))
6454

0 commit comments

Comments
 (0)