summaryrefslogtreecommitdiff
path: root/test/files/neg/t5760-pkgobj-warn.check
diff options
context:
space:
mode:
authorSom Snytt <som.snytt@gmail.com>2012-05-05 20:58:32 -0700
committerSom Snytt <som.snytt@gmail.com>2012-05-20 17:06:44 -0700
commit01c673efd80d687b6ba3cec09059a024cec6e7c2 (patch)
tree322d15c090c4b4abca3c8b6d6c49404a04c47de4 /test/files/neg/t5760-pkgobj-warn.check
parent1f5584fbe183041d4af269278f0125e2f0b94a44 (diff)
downloadscala-01c673efd80d687b6ba3cec09059a024cec6e7c2.tar.gz
scala-01c673efd80d687b6ba3cec09059a024cec6e7c2.tar.bz2
scala-01c673efd80d687b6ba3cec09059a024cec6e7c2.zip
SI-5760: Improve error message for package$Klass conflict with Klass
Added a clarification to DoubleDefError for when the previous symbol was in the package object but current symbol is not. This was actually supposed to be an opportunity to hack partest to run the two-step failing compilation, but somebody beat me to it and my rebase failed. The next hacking opportunity might be to add .pt script files! The possibilities are endless.
Diffstat (limited to 'test/files/neg/t5760-pkgobj-warn.check')
-rw-r--r--test/files/neg/t5760-pkgobj-warn.check4
1 files changed, 4 insertions, 0 deletions
diff --git a/test/files/neg/t5760-pkgobj-warn.check b/test/files/neg/t5760-pkgobj-warn.check
new file mode 100644
index 0000000000..a89398c3f7
--- /dev/null
+++ b/test/files/neg/t5760-pkgobj-warn.check
@@ -0,0 +1,4 @@
+stalepkg_2.scala:6: error: Foo is already defined as class Foo in package object stalepkg
+ class Foo
+ ^
+one error found