diff options
author | Miles Sabin <miles@milessabin.com> | 2016-05-20 12:49:42 +0100 |
---|---|---|
committer | Miles Sabin <miles@milessabin.com> | 2016-05-24 08:47:05 +0100 |
commit | bf478084fdf65c7bd156e2e6f04a96bfadf6986b (patch) | |
tree | a53cb3f1cfd15dfb4ba161d0afb3a51a9c40d8c7 | |
parent | 892a6d6878accb67e3fe68aefaa256396db05a90 (diff) | |
download | scala-bf478084fdf65c7bd156e2e6f04a96bfadf6986b.tar.gz scala-bf478084fdf65c7bd156e2e6f04a96bfadf6986b.tar.bz2 scala-bf478084fdf65c7bd156e2e6f04a96bfadf6986b.zip |
-Xexperimental mode now only includes -Ypartial-unification
-rw-r--r-- | src/compiler/scala/tools/nsc/settings/ScalaSettings.scala | 2 | ||||
-rw-r--r-- | test/files/run/t5676.flags | 2 | ||||
-rw-r--r-- | test/junit/scala/tools/nsc/settings/SettingsTest.scala | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala index dcbff24265..be34b15453 100644 --- a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala @@ -30,7 +30,7 @@ trait ScalaSettings extends AbsScalaSettings protected def defaultClasspath = sys.env.getOrElse("CLASSPATH", ".") /** Enabled under -Xexperimental. */ - protected def experimentalSettings = List[BooleanSetting](YmethodInfer, overrideObjects, overrideVars) + protected def experimentalSettings = List[BooleanSetting](YpartialUnification) /** Enabled under -Xfuture. */ protected def futureSettings = List[BooleanSetting]() diff --git a/test/files/run/t5676.flags b/test/files/run/t5676.flags index e1b37447c9..73f1330c31 100644 --- a/test/files/run/t5676.flags +++ b/test/files/run/t5676.flags @@ -1 +1 @@ --Xexperimental
\ No newline at end of file +-Yoverride-objects diff --git a/test/junit/scala/tools/nsc/settings/SettingsTest.scala b/test/junit/scala/tools/nsc/settings/SettingsTest.scala index 01a2351011..0f2d206273 100644 --- a/test/junit/scala/tools/nsc/settings/SettingsTest.scala +++ b/test/junit/scala/tools/nsc/settings/SettingsTest.scala @@ -31,11 +31,11 @@ class SettingsTest { val s = new MutableSettings(msg => throw new IllegalArgumentException(msg)) val (ok, residual) = s.processArguments(args.toList, processAll = true) assert(residual.isEmpty) - s.YmethodInfer // among -Xexperimental + s.YpartialUnification // among -Xexperimental } assertTrue(check("-Xexperimental").value) - assertFalse(check("-Xexperimental", "-Yinfer-argument-types:false").value) - assertFalse(check("-Yinfer-argument-types:false", "-Xexperimental").value) + assertFalse(check("-Xexperimental", "-Ypartial-unification:false").value) + assertFalse(check("-Ypartial-unification:false", "-Xexperimental").value) } // for the given args, select the desired setting |