Merge pull request #5102 from milessabin/2.12.x

SI-2712 Add support for partial unification of type constructors

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