Skip to content

Commit e32c777

Browse files
[autofix.ci] apply automated fixes
1 parent b292fb3 commit e32c777

File tree

2 files changed

+26
-19
lines changed

2 files changed

+26
-19
lines changed

core/codesig/src/mill/codesig/ReachabilityAnalysis.scala

+13-12
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,17 @@ class CallGraphAnalysis(
8282
logger.mandatoryLog(transitiveCallGraphHashes0)
8383
logger.log(transitiveCallGraphHashes)
8484

85-
lazy val (spanningInvalidationTree: Obj, invalidClassNames: Arr) = prevTransitiveCallGraphHashesOpt() match {
86-
case Some(prevTransitiveCallGraphHashes) =>
87-
CallGraphAnalysis.spanningInvalidationTree(
88-
prevTransitiveCallGraphHashes,
89-
transitiveCallGraphHashes0,
90-
indexToNodes,
91-
indexGraphEdges
92-
)
93-
case None => ujson.Obj() -> ujson.Arr()
94-
}
85+
lazy val (spanningInvalidationTree: Obj, invalidClassNames: Arr) =
86+
prevTransitiveCallGraphHashesOpt() match {
87+
case Some(prevTransitiveCallGraphHashes) =>
88+
CallGraphAnalysis.spanningInvalidationTree(
89+
prevTransitiveCallGraphHashes,
90+
transitiveCallGraphHashes0,
91+
indexToNodes,
92+
indexGraphEdges
93+
)
94+
case None => ujson.Obj() -> ujson.Arr()
95+
}
9596

9697
logger.mandatoryLog(spanningInvalidationTree)
9798
logger.mandatoryLog(invalidClassNames)
@@ -279,8 +280,8 @@ object CallGraphAnalysis {
279280
}
280281

281282
private def invalidClassNameSet(
282-
spanningForest: SpanningForest.Node,
283-
indexToClassName: Array[String]
283+
spanningForest: SpanningForest.Node,
284+
indexToClassName: Array[String]
284285
): Set[String] = {
285286
val queue = mutable.ArrayBuffer.empty[(Int, SpanningForest.Node)]
286287
val result = mutable.Set.empty[String]

scalalib/src/mill/scalalib/JavaModule.scala

+13-7
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import mill.util.Jvm
2121

2222
import os.Path
2323
import scala.util.Try
24+
2425
/**
2526
* Core configuration required to compile a single Java compilation target
2627
*/
@@ -95,7 +96,7 @@ trait JavaModule
9596
}
9697
}
9798

98-
private def quickTest(args: Seq[String]): Task[(String, Seq[TestResult])] =
99+
private def quickTest(args: Seq[String]): Task[(String, Seq[TestResult])] =
99100
Task(persistent = true) {
100101
val quicktestFailedClassesLog = Task.dest / "quickTestFailedClasses.log"
101102
val (analysisFolder, previousAnalysisFolderOpt) = callGraphAnalysis()
@@ -116,7 +117,9 @@ trait JavaModule
116117

117118
val quiteTestingClasses =
118119
Try {
119-
upickle.default.read[Seq[String]](os.read.stream(analysisFolder / "invalidClassNames.json"))
120+
upickle.default.read[Seq[String]](
121+
os.read.stream(analysisFolder / "invalidClassNames.json")
122+
)
120123
}.getOrElse(Seq.empty[String])
121124

122125
TestRunnerUtils.globFilter((failedTestClasses ++ quiteTestingClasses).distinct)
@@ -162,9 +165,12 @@ trait JavaModule
162165
.filter(testResult => Set("Error", "Failure").contains(testResult.status))
163166
.map(_.fullyQualifiedName)
164167
}
165-
166-
os.write.over(quicktestFailedClassesLog, upickle.default.write[Seq[String]](badTestClasses.distinct))
167-
168+
169+
os.write.over(
170+
quicktestFailedClassesLog,
171+
upickle.default.write[Seq[String]](badTestClasses.distinct)
172+
)
173+
168174
results match {
169175
case Result.Failure(errMsg) => Result.Failure(errMsg)
170176
case Result.Success((doneMsg, results)) =>
@@ -1466,7 +1472,7 @@ trait JavaModule
14661472
override def bspBuildTargetData: Task[Option[(String, AnyRef)]] = Task.Anon {
14671473
Some((JvmBuildTarget.dataKind, bspJvmBuildTargetTask()))
14681474
}
1469-
1475+
14701476
// Return the directory containing the current call graph analysis results, and previous one too if it exists
14711477
def callGraphAnalysis: T[(Path, Option[Path])] = Task(persistent = true) {
14721478
os.remove.all(Task.dest / "previous")
@@ -1547,7 +1553,7 @@ trait JavaModule
15471553
)
15481554
)
15491555
)
1550-
1556+
15511557
(Task.dest / "current", Option.when(os.exists(Task.dest / "previous"))(Task.dest / "previous"))
15521558
}
15531559
}

0 commit comments

Comments
 (0)