Skip to content

Commit 38df87e

Browse files
committed
#3071: rename d to outputDir
1 parent 991c51c commit 38df87e

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

compiler/src/dotty/tools/backend/jvm/GenBCode.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class GenBCode extends Phase {
4747
}
4848

4949
def outputDir(implicit ctx: Context): AbstractFile =
50-
new PlainDirectory(ctx.settings.d.value)
50+
new PlainDirectory(ctx.settings.outputDir.value)
5151

5252
def run(implicit ctx: Context): Unit = {
5353
new GenBCodePipeline(entryPoints.toList,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class ScalaSettings extends Settings.SettingGroup {
1818
val javaextdirs = PathSetting("-javaextdirs", "Override java extdirs classpath.", Defaults.javaExtDirs)
1919
val sourcepath = PathSetting("-sourcepath", "Specify location(s) of source files.", "") // Defaults.scalaSourcePath
2020
val classpath = PathSetting("-classpath", "Specify where to find user class files.", defaultClasspath) withAbbreviation "-cp"
21-
val d = DirectorySetting("-d", "directory|jar", "destination for generated classfiles.", Directory(Path(".")))
21+
val outputDir = DirectorySetting("-d", "directory|jar", "destination for generated classfiles.", Directory(Path(".")))
2222
val priorityclasspath = PathSetting("-priorityclasspath", "class path that takes precedence over all other paths (or testing only)", "")
2323

2424
/** Other settings */

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ object Settings {
163163
}
164164
case (DirectoryTag, arg :: args) =>
165165
val path = Path(arg)
166-
if (path.isDirectory) update(arg, args)
166+
if (path.isDirectory) update(Directory(path), args)
167167
else fail(s"'$arg' does not exist or is not a directory", args)
168168
case (_, Nil) =>
169169
missingArg

compiler/src/dotty/tools/repl/ReplDriver.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,10 @@ class ReplDriver(settings: Array[String],
106106
protected[this] def resetToInitial(): Unit = {
107107
rootCtx = initialCtx
108108
val outDir: AbstractFile = {
109-
if (rootCtx.settings.d.isDefault(rootCtx))
109+
if (rootCtx.settings.outputDir.isDefault(rootCtx))
110110
new VirtualDirectory("(memory)", None)
111111
else
112-
new PlainDirectory(rootCtx.settings.d.value(rootCtx))
112+
new PlainDirectory(rootCtx.settings.outputDir.value(rootCtx))
113113
}
114114
compiler = new ReplCompiler(outDir)
115115
rendering = new Rendering(compiler, classLoader)

0 commit comments

Comments
 (0)