Rename -Xlink-optimise to -Xlink

Author: nicolasstucki

compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

@@ -114,7 +114,7 @@ class ScalaSettings extends Settings.SettingGroup {
   val YoptPhases = PhasesSetting("-Yopt-phases", "Restrict the optimisation phases to execute under -optimise.")
   val YoptFuel = IntSetting("-Yopt-fuel", "Maximum number of optimisations performed under -optimise.", -1)
   val optimise = BooleanSetting("-optimise", "Generates faster bytecode by applying local optimisations to the .program") withAbbreviation "-optimize"
-  val XlinkOptimise = BooleanSetting("-Xlink-optimise", "Recompile library code with the application.").withAbbreviation("-Xlink-optimize")
+  val Xlink = BooleanSetting("-Xlink", "Recompile library code with the application.")
 
   /** Dottydoc specific settings */
   val siteRoot = StringSetting(

compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala

@@ -326,7 +326,7 @@ class ClassfileLoader(val classfile: AbstractFile) extends SymbolLoader {
     val (classRoot, moduleRoot) = rootDenots(root.asClass)
     val classfileParser = new ClassfileParser(classfile, classRoot, moduleRoot)(ctx)
     val result = classfileParser.run()
-    if (ctx.settings.YretainTrees.value || ctx.settings.XlinkOptimise.value) {
+    if (ctx.settings.YretainTrees.value || ctx.settings.Xlink.value) {
       result match {
         case Some(unpickler: tasty.DottyUnpickler) =>
           classRoot.symbol.asClass.unpickler = unpickler

compiler/src/dotty/tools/dotc/core/Symbols.scala

@@ -604,7 +604,7 @@ object Symbols {
 
     /** If this is either:
       *   - a top-level class and `-Yretain-trees` is set
-     *    - a top-level class loaded from TASTY and `-Xlink-optimise` is set
+     *    - a top-level class loaded from TASTY and `-Xlink` is set
       * then return the TypeDef tree (possibly wrapped inside PackageDefs) for this class, otherwise EmptyTree.
       * This will force the info of the class.
       */

compiler/src/dotty/tools/dotc/transform/LinkAll.scala

@@ -64,7 +64,7 @@ class LinkAll extends Phase {
   }
 
   private def doLink(implicit ctx: Context): Boolean = {
-    val link = ctx.settings.XlinkOptimise
+    val link = ctx.settings.Xlink
     if (link.value) {
       val out = ctx.settings.outputDir
       if (out.value.extension != "jar")
@@ -77,7 +77,7 @@ class LinkAll extends Phase {
 object LinkAll {
 
   private[LinkAll] def loadCompilationUnit(clsd: ClassDenotation)(implicit ctx: Context): Option[CompilationUnit] = {
-    assert(ctx.settings.XlinkOptimise.value)
+    assert(ctx.settings.Xlink.value)
     val tree = clsd.symbol.asClass.tree
     if (tree.isEmpty) None
     else {

compiler/test/dotty/tools/dotc/LinkOptimiseTests.scala

@@ -42,7 +42,7 @@ class LinkOptimiseTests extends ParallelTesting {
 
     // Setup class paths
     def mkLinkClassFlags(libPath: String) =
-      TestFlags(mkClassPath(libPath :: Jars.dottyTestDeps), mkClassPath(Jars.dottyTestDeps), basicDefaultOptions :+ "-Xlink-optimise")
+      TestFlags(mkClassPath(libPath :: Jars.dottyTestDeps), mkClassPath(Jars.dottyTestDeps), basicDefaultOptions :+ "-Xlink")
     val strawmanClassPath = mkLinkClassFlags(defaultOutputDir + "strawmanLibrary/main/")
     val customLibClassFlags = mkLinkClassFlags(defaultOutputDir + "linkCustomLib/custom-lib")
 

compiler/test/dotty/tools/vulpix/TestFlags.scala

@@ -13,7 +13,7 @@ final case class TestFlags(
 
   def all: Array[String] = Array("-classpath", defaultClassPath) ++ options
 
-  def isLinkTest: Boolean = options.contains("-Xlink-optimise")
+  def isLinkTest: Boolean = options.contains("-Xlink")
 }
 
 object TestFlags {

dist/bin/dotl

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-dotc -tasty -Xlink-optimise $@
+dotc -tasty -Xlink $@

project/Build.scala

@@ -523,7 +523,7 @@ object Build {
         }
 
         val main =
-          if (fullArgs.contains("-Xlink-optimise")) "dotty.tools.dotc.FromTasty"
+          if (fullArgs.contains("-Xlink")) "dotty.tools.dotc.FromTasty"
           else "dotty.tools.dotc.Main"
 
         (runMain in Compile).toTask((main +: fullArgs).mkString(" ", " ", ""))