Skip to content

Commit 64c6296

Browse files
committed
.
1 parent 76c0b44 commit 64c6296

3 files changed

Lines changed: 13 additions & 16 deletions

File tree

core/exec/src/mill/exec/Execution.scala

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -317,13 +317,13 @@ case class Execution(
317317
leaseTracker = tracker
318318
)
319319

320-
// Count new failures - if there are upstream failures, tasks should be skipped, not failed
320+
// Count new failures - if there are upstream failures, tasks should be skipped, not failed
321321
val newFailures = res.newResults.values.count(r => r.asFailing.isDefined)
322322

323323
rootFailedCount.addAndGet(newFailures)
324324
completedCount.incrementAndGet()
325325

326-
// Always show completed count in header after task finishes
326+
// Always show completed count in header after task finishes
327327
logger.prompt.setPromptHeaderPrefix(formatHeaderPrefix())
328328

329329
if (failFast && res.newResults.values.exists(_.asSuccess.isEmpty))
@@ -349,14 +349,14 @@ case class Execution(
349349
}
350350
}
351351
} catch {
352-
// Let StopWithResponse propagate - it's a controlled shutdown signal
353-
case e: mill.api.daemon.StopWithResponse[?] => throw e
354-
// Wrapping the fatal error in a non-fatal exception, so it would be caught by Scala's Future
355-
// infrastructure, rather than silently terminating the future and leaving downstream Awaits hanging.
352+
// Let StopWithResponse propagate - it's a controlled shutdown signal
353+
case e: mill.api.daemon.StopWithResponse[?] => throw e
354+
// Wrapping the fatal error in a non-fatal exception, so it would be caught by Scala's Future
355+
// infrastructure, rather than silently terminating the future and leaving downstream Awaits hanging.
356356
case e: Throwable if !mill.api.daemon.internal.NonFatal(e) =>
357357
val nonFatal = new Exception(s"fatal exception occurred: $e", e)
358-
// Set the stack trace of the non-fatal exception to the original exception's stack trace
359-
// as it actually indicates the location of the error.
358+
// Set the stack trace of the non-fatal exception to the original exception's stack trace
359+
// as it actually indicates the location of the error.
360360
nonFatal.setStackTrace(e.getStackTrace)
361361
throw nonFatal
362362
} finally {
@@ -367,7 +367,7 @@ case class Execution(
367367
}
368368

369369
// Make sure we wait for all tasks from this batch to finish before starting the next
370-
// one, so we don't mix up exclusive and non-exclusive tasks running at the same time
370+
// one, so we don't mix up exclusive and non-exclusive tasks running at the same time
371371
terminals.map(t => (t, Await.result(futures(t), duration.Duration.Inf)))
372372
}
373373

@@ -376,8 +376,8 @@ case class Execution(
376376
case _ => !serialCommandExec
377377
}
378378

379-
// Run all non-command tasks according to the threads
380-
// given but run the commands in linear order
379+
// Run all non-command tasks according to the threads
380+
// given but run the commands in linear order
381381
val nonExclusiveResults = evaluateTerminals(nonExclusiveTasks, exclusive = false)
382382

383383
val exclusiveResults = evaluateTerminals(leafExclusiveCommands, exclusive = true)
@@ -448,7 +448,6 @@ case class Execution(
448448

449449
object Execution {
450450

451-
452451
/**
453452
* Tracks per-task read leases on the workspace lock and releases them once
454453
* every downstream task that depends on the holder has completed.

runner/daemon/src/mill/daemon/BspMode.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ private[daemon] object BspMode {
4141
if (runnerState.errorOpt.isEmpty && runnerState.finalFrame.isDefined)
4242
bspPrevState.set(Some(runnerState))
4343
body(runnerState.allEvaluators, runnerState.watched, runnerState.errorOpt)
44-
}
44+
}
4545

4646
val (bspServerHandle, _) = startBspServer(bootstrapBridge)
4747

runner/daemon/src/mill/daemon/RunnerLauncherState.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import upickle.{ReadWriter, macroRW}
1515
* active evaluators, retained meta-build read leases, final-task watches,
1616
* and the launcher session/artifact handles.
1717
*/
18-
@internal
18+
1919
case class RunnerLauncherState(
2020
errorOpt: Option[String] = None,
2121
buildFile: Option[String] = None,
@@ -83,7 +83,6 @@ case class RunnerLauncherState(
8383
object RunnerLauncherState {
8484
def empty: RunnerLauncherState = RunnerLauncherState()
8585

86-
@internal
8786
case class MetaBuildFrame(
8887
depth: Int,
8988
evaluator: EvaluatorApi,
@@ -138,7 +137,6 @@ object RunnerLauncherState {
138137
)
139138
}
140139

141-
@internal
142140
case class FinalFrame(
143141
depth: Int,
144142
evaluator: EvaluatorApi,

0 commit comments

Comments
 (0)