SI-3368 Promote xml option to -Xxml

As long as Scala does XML literals, there is probably parsing
behavior worth configuring.

Therefore, the umbrella option is promoted to `-Xxml`.

It was tempting to make it `-XML`, but we resisted.

1 files changed, 12 insertions, 12 deletions

diff --git a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala
index e10b3bc259..b783e80db9 100644
--- a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala
+++ b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala
@@ -139,6 +139,18 @@ trait ScalaSettings extends AbsScalaSettings
   val XnoPatmatAnalysis = BooleanSetting ("-Xno-patmat-analysis", "Don't perform exhaustivity/unreachability analysis. Also, ignore @switch annotation.")
   val XfullLubs         = BooleanSetting ("-Xfull-lubs", "Retains pre 2.10 behavior of less aggressive truncation of least upper bounds.")
 
+  // XML parsing options
+  object XxmlSettings extends MultiChoiceEnumeration {
+    val coalescing   = Value
+    def isCoalescing = Xxml contains coalescing
+  }
+  val Xxml = MultiChoiceSetting(
+    name    = "-Xxml",
+    helpArg = "property",
+    descr   = "Configure XML parsing",
+    domain  = XxmlSettings
+  )
+
   /** Compatibility stubs for options whose value name did
    *  not previously match the option name.
    */
@@ -305,18 +317,6 @@ trait ScalaSettings extends AbsScalaSettings
     ) withPostSetHook { _ => scala.reflect.internal.util.Statistics.enabled = true }
   }
 
-  // XML parsing options (transitional in 2.11)
-  object YxmlSettings extends MultiChoiceEnumeration {
-    val coalescing   = Value
-    def isCoalescing = Yxml contains coalescing
-  }
-  val Yxml = MultiChoiceSetting(
-    name    = "-Yxml",
-    helpArg = "property",
-    descr   = "Configure XML parsing",
-    domain  = YxmlSettings
-  )
-
   def YstatisticsEnabled = Ystatistics.value.nonEmpty
 
   /** Area-specific debug output.