summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorMiles Sabin <miles@milessabin.com>2016-05-20 12:49:42 +0100
committerMiles Sabin <miles@milessabin.com>2016-05-24 08:47:05 +0100
commitbf478084fdf65c7bd156e2e6f04a96bfadf6986b (patch)
treea53cb3f1cfd15dfb4ba161d0afb3a51a9c40d8c7 /src/compiler
parent892a6d6878accb67e3fe68aefaa256396db05a90 (diff)
downloadscala-bf478084fdf65c7bd156e2e6f04a96bfadf6986b.tar.gz
scala-bf478084fdf65c7bd156e2e6f04a96bfadf6986b.tar.bz2
scala-bf478084fdf65c7bd156e2e6f04a96bfadf6986b.zip
-Xexperimental mode now only includes -Ypartial-unification
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/settings/ScalaSettings.scala2
1 files changed, 1 insertions, 1 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]()