diff options
author | James Iry <jamesiry@gmail.com> | 2013-02-04 14:48:23 -0800 |
---|---|---|
committer | James Iry <jamesiry@gmail.com> | 2013-02-06 13:00:43 -0800 |
commit | 1426fec358342e0b052c5a96ee2b7e60d4d4066b (patch) | |
tree | 6ec782d4d4f9c6afe592cd335462e4e37a03d69f /test/files/neg/t5954.check | |
parent | 3d318be51f8e8cdec314565920327486212f5020 (diff) | |
download | scala-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.check')
-rw-r--r-- | test/files/neg/t5954.check | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/files/neg/t5954.check b/test/files/neg/t5954.check index 3ca47cd430..ed10658b24 100644 --- a/test/files/neg/t5954.check +++ b/test/files/neg/t5954.check @@ -1,16 +1,16 @@ -t5954.scala:36: error: implementation restriction: package object A cannot contain case class D. Instead, class D should be placed directly in package A. +t5954.scala:36: error: class D should be placed directly in package A instead of package object A. Under some circumstances companion objects and case classes in package objects can fail to recompile. See https://issues.scala-lang.org/browse/SI-5954. case class D() ^ -t5954.scala:35: error: implementation restriction: package object A cannot contain companion object C. Instead, object C should be placed directly in package A. +t5954.scala:35: error: object C should be placed directly in package A instead of package object A. Under some circumstances companion objects and case classes in package objects can fail to recompile. See https://issues.scala-lang.org/browse/SI-5954. object C ^ -t5954.scala:34: error: implementation restriction: package object A cannot contain companion trait C. Instead, trait C should be placed directly in package A. +t5954.scala:34: error: trait C should be placed directly in package A instead of package object A. Under some circumstances companion objects and case classes in package objects can fail to recompile. See https://issues.scala-lang.org/browse/SI-5954. trait C ^ -t5954.scala:33: error: implementation restriction: package object A cannot contain companion object B. Instead, object B should be placed directly in package A. +t5954.scala:33: error: object B should be placed directly in package A instead of package object A. Under some circumstances companion objects and case classes in package objects can fail to recompile. See https://issues.scala-lang.org/browse/SI-5954. object B ^ -t5954.scala:32: error: implementation restriction: package object A cannot contain companion class B. Instead, class B should be placed directly in package A. +t5954.scala:32: error: class B should be placed directly in package A instead of package object A. Under some circumstances companion objects and case classes in package objects can fail to recompile. See https://issues.scala-lang.org/browse/SI-5954. class B ^ 5 errors found |