Skip to content

Commit 2865580

Browse files
committed
wip
1 parent 05fcf8b commit 2865580

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

libs/javalib/worker/src/mill/javalib/zinc/ZincWorker.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,6 @@ class ZincWorker(jobs: Int) extends AutoCloseable { self =>
406406

407407
val finalScalacOptions = addColorNeverOption.toSeq ++ scalacOptions
408408

409-
410409
val newReporter = reporter match {
411410
case None =>
412411
new ManagedLoggedReporter(maxErrors, logger) with RecordingReporter

runner/meta/src/mill/meta/CodeGen.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ object CodeGen {
3232
// Provide `build` as an alias to the root `build_.package_`, since from the user's
3333
// perspective it looks like they're writing things that live in `package build`,
3434
// but at compile-time we rename things, we so provide an alias to preserve the fiction
35-
val aliasImports = "import build_.{package_ => build}"
3635

3736
for (scriptPath <- scriptSources) {
3837
val scriptFolderPath = scriptPath / os.up

runner/meta/src/mill/meta/FileImportGraph.scala

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ import mill.internal.Util.backtickWrap
1717
* @param metaBuild If `true`, a meta-build is enabled
1818
*/
1919
@internal
20-
case class FileImportGraph(seenScripts: Map[os.Path, String], errors: Seq[String], seenPkgStatements: Map[os.Path, String])
20+
case class FileImportGraph(
21+
seenScripts: Map[os.Path, String],
22+
errors: Seq[String],
23+
seenPkgStatements: Map[os.Path, String]
24+
)
2125

2226
/**
2327
* Logic around traversing the `import $file` graph, extracting necessary info

runner/meta/src/mill/meta/MillBuildRootModule.scala

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,11 @@ trait MillBuildRootModule()(using
297297
super.mandatoryScalacOptions() ++
298298
// This warning comes up for package names with dashes in them like "package build.`foo-bar`",
299299
// but Mill generally handles these fine, so no need to warn the user
300-
Seq("-deprecation", "-Wconf:msg=will be encoded on the classpath:silent", "-Ymagic-offset-header:SOURCE_CODE_START")
300+
Seq(
301+
"-deprecation",
302+
"-Wconf:msg=will be encoded on the classpath:silent",
303+
"-Ymagic-offset-header:SOURCE_CODE_START"
304+
)
301305
}
302306

303307
/** Used in BSP IntelliJ, which can only work with directories */

0 commit comments

Comments
 (0)