summaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2016-05-27 17:58:17 +1000
committerJason Zaugg <jzaugg@gmail.com>2016-05-27 17:58:17 +1000
commit6b2037a2161de650fdbb010ba1da23d843247234 (patch)
treea6cffc611df52861a7917493c88a67d9e58ad72c /project
parent79ec0f31e611d37d5c50a966a4cd6bf24d96cda6 (diff)
parentbf478084fdf65c7bd156e2e6f04a96bfadf6986b (diff)
downloadscala-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 'project')
-rw-r--r--project/ScalaOptionParser.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/project/ScalaOptionParser.scala b/project/ScalaOptionParser.scala
index 82b8f5762c..77c9d765e9 100644
--- a/project/ScalaOptionParser.scala
+++ b/project/ScalaOptionParser.scala
@@ -86,7 +86,7 @@ object ScalaOptionParser {
"-Yeta-expand-keeps-star", "-Yide-debug", "-Yinfer-argument-types", "-Yinfer-by-name",
"-Yissue-debug", "-Ylog-classpath", "-Ymacro-debug-lite", "-Ymacro-debug-verbose", "-Ymacro-no-expand",
"-Yno-completion", "-Yno-generic-signatures", "-Yno-imports", "-Yno-predef",
- "-Yoverride-objects", "-Yoverride-vars", "-Ypatmat-debug", "-Yno-adapted-args", "-Ypos-debug", "-Ypresentation-debug",
+ "-Yoverride-objects", "-Yoverride-vars", "-Ypatmat-debug", "-Yno-adapted-args", "-Ypartial-unification", "-Ypos-debug", "-Ypresentation-debug",
"-Ypresentation-strict", "-Ypresentation-verbose", "-Yquasiquote-debug", "-Yrangepos", "-Yreify-copypaste", "-Yreify-debug", "-Yrepl-class-based",
"-Yrepl-sync", "-Yshow-member-pos", "-Yshow-symkinds", "-Yshow-symowners", "-Yshow-syms", "-Yshow-trees", "-Yshow-trees-compact", "-Yshow-trees-stringified", "-Ytyper-debug",
"-Ywarn-adapted-args", "-Ywarn-dead-code", "-Ywarn-inaccessible", "-Ywarn-infer-any", "-Ywarn-nullary-override", "-Ywarn-nullary-unit", "-Ywarn-numeric-widen", "-Ywarn-unused", "-Ywarn-unused-import", "-Ywarn-value-discard",