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 /src/reflect | |
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 'src/reflect')
-rw-r--r-- | src/reflect/scala/reflect/internal/settings/MutableSettings.scala | 2 | ||||
-rw-r--r-- | src/reflect/scala/reflect/runtime/Settings.scala | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/src/reflect/scala/reflect/internal/settings/MutableSettings.scala b/src/reflect/scala/reflect/internal/settings/MutableSettings.scala index ec3501d5bc..81368df7a6 100644 --- a/src/reflect/scala/reflect/internal/settings/MutableSettings.scala +++ b/src/reflect/scala/reflect/internal/settings/MutableSettings.scala @@ -47,6 +47,4 @@ abstract class MutableSettings extends AbsSettings { def XoldPatmat: BooleanSetting def XnoPatmatAnalysis: BooleanSetting def XfullLubs: BooleanSetting - def companionsInPkgObjs: BooleanSetting - } diff --git a/src/reflect/scala/reflect/runtime/Settings.scala b/src/reflect/scala/reflect/runtime/Settings.scala index 2d5b76f094..0e0cf3fc40 100644 --- a/src/reflect/scala/reflect/runtime/Settings.scala +++ b/src/reflect/scala/reflect/runtime/Settings.scala @@ -43,7 +43,6 @@ private[reflect] class Settings extends MutableSettings { val printtypes = new BooleanSetting(false) val uniqid = new BooleanSetting(false) val verbose = new BooleanSetting(false) - val companionsInPkgObjs = new BooleanSetting(false) val Yrecursion = new IntSetting(0) val maxClassfileName = new IntSetting(255) |