diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-05-27 17:58:17 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-05-27 17:58:17 +1000 |
| commit | 6b2037a2161de650fdbb010ba1da23d843247234 (patch) | |
| tree | a6cffc611df52861a7917493c88a67d9e58ad72c /src/compiler/scala/tools/nsc/settings | |
| parent | 79ec0f31e611d37d5c50a966a4cd6bf24d96cda6 (diff) | |
| parent | bf478084fdf65c7bd156e2e6f04a96bfadf6986b (diff) | |
| download | scala-6b2037a2161de650fdbb010ba1da23d843247234.tar.gz scala-6b2037a2161de650fdbb010ba1da23d843247234.tar.bz2 scala-6b2037a2161de650fdbb010ba1da23d843247234.zip | |
Merge pull request #5102 from milessabin/2.12.x
SI-2712 Add support for partial unification of type constructors
Diffstat (limited to 'src/compiler/scala/tools/nsc/settings')
| -rw-r--r-- | src/compiler/scala/tools/nsc/settings/ScalaSettings.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala index c55693d60e..4d236b226d 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]() @@ -201,6 +201,7 @@ trait ScalaSettings extends AbsScalaSettings val etaExpandKeepsStar = BooleanSetting ("-Yeta-expand-keeps-star", "Eta-expand varargs methods to T* rather than Seq[T]. This is a temporary option to ease transition.").withDeprecationMessage(removalIn212) val inferByName = BooleanSetting ("-Yinfer-by-name", "Allow inference of by-name types. This is a temporary option to ease transition. See SI-7899.").withDeprecationMessage(removalIn212) val YdisableFlatCpCaching = BooleanSetting ("-YdisableFlatCpCaching", "Do not cache flat classpath representation of classpath elements from jars across compiler instances.") + val YpartialUnification = BooleanSetting ("-Ypartial-unification", "Enable partial unification in type constructor inference") val exposeEmptyPackage = BooleanSetting ("-Yexpose-empty-package", "Internal only: expose the empty package.").internalOnly() val Ydelambdafy = ChoiceSetting ("-Ydelambdafy", "strategy", "Strategy used for translating lambdas into JVM code.", List("inline", "method"), "method") |