summaryrefslogtreecommitdiff
path: root/test/files/neg/t2870.check
diff options
context:
space:
mode:
authorVojin Jovanovic <vojin.jovanovic@epfl.ch>2012-01-25 15:24:18 +0100
committerVojin Jovanovic <vojin.jovanovic@epfl.ch>2012-01-25 15:24:18 +0100
commitf814d40ea917592f78d2e8ca4c78f34ce4b5f297 (patch)
treecafac6a0d757419132fd75ab788f8163a619780b /test/files/neg/t2870.check
parent85daadef89a9ed5c3901a5822221366ee6746d49 (diff)
parentde2b0c68785afc0f801fbe8d2750366e90c9fa70 (diff)
downloadscala-f814d40ea917592f78d2e8ca4c78f34ce4b5f297.tar.gz
scala-f814d40ea917592f78d2e8ca4c78f34ce4b5f297.tar.bz2
scala-f814d40ea917592f78d2e8ca4c78f34ce4b5f297.zip
Merge branch 'master' into execution-context
Diffstat (limited to 'test/files/neg/t2870.check')
-rw-r--r--test/files/neg/t2870.check8
1 files changed, 5 insertions, 3 deletions
diff --git a/test/files/neg/t2870.check b/test/files/neg/t2870.check
index 72bc0d98a1..ab962d48c8 100644
--- a/test/files/neg/t2870.check
+++ b/test/files/neg/t2870.check
@@ -1,7 +1,9 @@
t2870.scala:1: error: not found: type Jar (similar: Jars)
class Jars(jar: Jar)
^
-t2870.scala:6: error: illegal cyclic reference involving value <import>
- val scala = fromClasspathString(javaClassPath)
- ^
+t2870.scala:4: error: encountered unrecoverable cycle resolving import.
+Note: this is often due in part to a class depending on a definition nested within its companion.
+If applicable, you may wish to try moving some members into another object.
+ import scala.util.Properties.javaClassPath
+ ^
two errors found