fix: deps checker

timothyklim · May 23, 2024 · bdd6e0a · bdd6e0a
1 parent cb41b9e
commit bdd6e0a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/rules/scala/workspace.bzl b/rules/scala/workspace.bzl
@@ -64,7 +64,7 @@ def scala_repositories():
     )
 
     scala2 = "2.13.14"
-    scala3 = "3.4.1-RC2"
+    scala3 = "3.5.0-RC1"
     scalajs = "1.16.0"
 
     direct_deps = [

diff --git a/scala/workers/deps/DepsRunner.scala b/scala/workers/deps/DepsRunner.scala
@@ -89,12 +89,7 @@ object DepsRunner extends WorkerMain[Unit]:
         val pathsMap = new mutable.HashMap[String, String](initialCapacity = groups.size, loadFactor = 0.75)
 
         for group <- groups do
-          val depLabel = group.label.tail match
-            case label if label.startsWith("@@//") => label.drop(2)
-            case label if label.startsWith("@//")  => label.drop(1)
-            case label if label.startsWith("@@")   => label.drop(1)
-            case label                             => label
-
+          val depLabel = normalizeLabel(group.label.tail)
           depLabelsMap.put(depLabel, group.jars.toSet)
 
           for path <- group.jars do pathsMap.put(path, depLabel)
@@ -106,7 +101,8 @@ object DepsRunner extends WorkerMain[Unit]:
     val remove =
       if workArgs.checkUsed then
         val usedWhitelist = workArgs.usedWhitelist.map(_.tail)
-        directLabels.diff(usedWhitelist).filterNot(depLabel => depLabelToPaths(depLabel).exists(usedPaths))
+        directLabels.diff(usedWhitelist).filterNot: depLabel =>
+          depLabelToPaths.get(normalizeLabel(depLabel)).fold(false)(_.exists(usedPaths))
       else Nil
 
     for depLabel <- remove do
@@ -118,7 +114,9 @@ object DepsRunner extends WorkerMain[Unit]:
       if workArgs.checkDirect then
         val unusedWhitelist = workArgs.unusedWhitelist.map(_.tail)
         usedPaths
-          .diff(Set.concat(directLabels, unusedWhitelist).flatMap(depLabelToPaths))
+          .diff:
+            Set.concat(directLabels, unusedWhitelist).flatMap: label =>
+              depLabelToPaths.get(normalizeLabel(label)).fold(Set.empty)(identity)
           .flatMap: path =>
             pathToLabel.get(path) match
               case res @ None =>
@@ -137,3 +135,9 @@ object DepsRunner extends WorkerMain[Unit]:
 
   private val EmptyLabelsMap = Map.empty[String, collection.Set[String]]
   private val EmptyPathsMap = Map.empty[String, String]
+
+  private def normalizeLabel(label: String): String = label match
+    case label if label.startsWith("@@//") => label.drop(2)
+    case label if label.startsWith("@//")  => label.drop(1)
+    case label if label.startsWith("@@")   => label.drop(1)
+    case label                             => label
diff --git a/scala/workers/zinc/test/TestFrameworkRunner.scala b/scala/workers/zinc/test/TestFrameworkRunner.scala
@@ -115,7 +115,7 @@ object TestFrameworkRunner:
       reporter: TestReporter
   ): (mutable.ListBuffer[(String, collection.Seq[Event])], collection.Set[String]) =
     val finishedTasks =
-      if parallel then
+      if parallel && tasks.size > 1 then
         val xs = parallelN.fold(Seq(tasks))(tasks.grouped(_).toSeq)
         val fut = Future.traverse(xs): xs =>
           Future.sequence(xs.map(t => Future(runTask(t))))