Skip to content

Commit 98091d8

Browse files
committed
Rename -tasty to -from-tasty
1 parent e675e6b commit 98091d8

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

compiler/src/dotty/tools/dotc/Driver.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import fromtasty.TASTYCompiler
1717
class Driver extends DotClass {
1818

1919
protected def newCompiler(implicit ctx: Context): Compiler =
20-
if (ctx.settings.tasty.value) new TASTYCompiler
20+
if (ctx.settings.fromTasty.value) new TASTYCompiler
2121
else new Compiler
2222

2323
protected def emptyReporter: Reporter = new StoreReporter(null)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class ScalaSettings extends Settings.SettingGroup {
4242
val language = MultiStringSetting("-language", "feature", "Enable one or more language features.")
4343
val rewrite = OptionSetting[Rewrites]("-rewrite", "When used in conjunction with -language:Scala2 rewrites sources to migrate to new syntax")
4444
val silentWarnings = BooleanSetting("-nowarn", "Silence all warnings.")
45-
val tasty = BooleanSetting("-tasty", "Compile classes from tasty in classpath. The arguments are used as class names.")
45+
val fromTasty = BooleanSetting("-from-tasty", "Compile classes from tasty in classpath. The arguments are used as class names.")
4646

4747
/** -X "Advanced" settings
4848
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ class ClassfileLoader(val classfile: AbstractFile) extends SymbolLoader {
337337
}
338338

339339
private def mayLoadTreesFromTasty(implicit ctx: Context): Boolean =
340-
ctx.settings.YretainTrees.value || ctx.settings.XlinkOptimise.value || ctx.settings.tasty.value
340+
ctx.settings.YretainTrees.value || ctx.settings.XlinkOptimise.value || ctx.settings.fromTasty.value
341341
}
342342

343343
class SourcefileLoader(val srcfile: AbstractFile) extends SymbolLoader {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
395395
protected def compileFromTasty(flags0: TestFlags, suppressErrors: Boolean, targetDir: JFile): TestReporter = {
396396
val tastyOutput = new JFile(targetDir.getPath + "_from-tasty")
397397
tastyOutput.mkdir()
398-
val flags = flags0 and ("-d", tastyOutput.getAbsolutePath) and "-tasty"
398+
val flags = flags0 and ("-d", tastyOutput.getAbsolutePath) and "-form-tasty"
399399

400400
def hasTastyFileToClassName(f: JFile): String =
401401
targetDir.toPath.relativize(f.toPath).toString.dropRight(".hasTasty".length).replace('/', '.')
@@ -1099,7 +1099,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
10991099
val target = JointCompilationSource(
11001100
testGroup.name,
11011101
Array(sourceFile),
1102-
flags.withClasspath(tastySource.getPath) and "-tasty",
1102+
flags.withClasspath(tastySource.getPath) and "-from-tasty",
11031103
tastySource,
11041104
fromTasty = true
11051105
)

0 commit comments

Comments
 (0)