diff options
author | Paul Phillips <paulp@improving.org> | 2011-06-01 05:15:49 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-06-01 05:15:49 +0000 |
commit | d838e10f7bad42762584a1390ef6fd85b4796d46 (patch) | |
tree | 03c37de5fcf1cc01746a3564a378947e1b71891b /test/files | |
parent | 46c81507437d3202826e2ab53f328b241a6c9387 (diff) | |
download | scala-d838e10f7bad42762584a1390ef6fd85b4796d46.tar.gz scala-d838e10f7bad42762584a1390ef6fd85b4796d46.tar.bz2 scala-d838e10f7bad42762584a1390ef6fd85b4796d46.zip |
The eagerly awaited companion commit to r23622,...
The eagerly awaited companion commit to r23622, the surprise hit of last
winter. Singletons now have the singleton type inferred in monomorphic
contexts as well. In english:
scala> object X
defined module X
scala> def f = X
f: X.type
Wait, that's not english. English review by moors.
Diffstat (limited to 'test/files')
-rw-r--r-- | test/files/jvm/interpreter.check | 4 | ||||
-rw-r--r-- | test/files/neg/t3507.check | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/files/jvm/interpreter.check b/test/files/jvm/interpreter.check index 25804a3a60..42a8ae8855 100644 --- a/test/files/jvm/interpreter.check +++ b/test/files/jvm/interpreter.check @@ -370,5 +370,5 @@ plusOne: (x: Int)Int res0: Int = 6 res1: java.lang.String = after reset <console>:8: error: not found: value plusOne - plusOne(5) // should be undefined now - ^ + plusOne(5) // should be undefined now + ^ diff --git a/test/files/neg/t3507.check b/test/files/neg/t3507.check index ab38280c1f..8e538e4a8b 100644 --- a/test/files/neg/t3507.check +++ b/test/files/neg/t3507.check @@ -1,4 +1,4 @@ -t3507.scala:13: error: No Manifest available for object _1.b.c. +t3507.scala:13: error: No Manifest available for _1.b.c.type. mani/*[object _1.b.c]*/(c) // kaboom in manifestOfType / TreeGen.mkAttributedQualifier ^ one error found |