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 /test/junit | |
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 'test/junit')
-rw-r--r-- | test/junit/scala/tools/nsc/settings/SettingsTest.scala | 6 |
1 files changed, 3 insertions, 3 deletions
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 |