summaryrefslogtreecommitdiff
path: root/test/files/neg/t5954.scala
diff options
context:
space:
mode:
authorJames Iry <jamesiry@gmail.com>2013-02-04 14:48:23 -0800
committerJames Iry <jamesiry@gmail.com>2013-02-06 13:00:43 -0800
commit1426fec358342e0b052c5a96ee2b7e60d4d4066b (patch)
tree6ec782d4d4f9c6afe592cd335462e4e37a03d69f /test/files/neg/t5954.scala
parent3d318be51f8e8cdec314565920327486212f5020 (diff)
downloadscala-1426fec358342e0b052c5a96ee2b7e60d4d4066b.tar.gz
scala-1426fec358342e0b052c5a96ee2b7e60d4d4066b.tar.bz2
scala-1426fec358342e0b052c5a96ee2b7e60d4d4066b.zip
SI-7070 Turn restriction on companions in pkg objs into warning
The implementation restriction created from SI-5954 in 3ef487ecb6733bfe3c13d89780ebcfc81f9a5ea0 has two problems. 1) The problematic code works fine if compile with sbt. That means the restriction is breaking some people needlessly. 2) It's not binary compatible. To fix all that this commit changes the error into a warning and removes the setting used to get around the restriction.
Diffstat (limited to 'test/files/neg/t5954.scala')
-rw-r--r--test/files/neg/t5954.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/neg/t5954.scala b/test/files/neg/t5954.scala
index 9e6f5392c7..3ccb5ed3ff 100644
--- a/test/files/neg/t5954.scala
+++ b/test/files/neg/t5954.scala
@@ -1,4 +1,4 @@
-// if you ever think you've fixed the underlying reason for the implementation restrictions
+// if you ever think you've fixed the underlying reason for the warning
// imposed by SI-5954, then here's a test that should pass with two "succes"es
//
//import scala.tools.partest._