Backport Scala 3 changes (com-lihaoyi#4347)

vaslabs-ltd · Jan 17, 2025 · f4270e7 · f4270e7
1 parent 863f1af
commit f4270e7
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/integration/invalidation/codesig-hello/src/CodeSigHelloTests.scala b/integration/invalidation/codesig-hello/src/CodeSigHelloTests.scala
@@ -21,7 +21,8 @@ object CodeSigHelloTests extends UtestIntegrationTestSuite {
       modifyFile(workspacePath / "build.mill", _.replace("running foo", "running foo2"))
       val mangledFoo = eval("foo")
 
-      assert(mangledFoo.out.linesIterator.toSeq == Seq("running foo2", "running helperFoo"))
+      val out1 = mangledFoo.out.linesIterator.toSeq
+      assert(out1 == Seq("running foo2", "running helperFoo"))
 
       val cached2 = eval("foo")
       assert(cached2.out == "")

diff --git a/javascriptlib/src/mill/javascriptlib/ReactScriptsModule.scala b/javascriptlib/src/mill/javascriptlib/ReactScriptsModule.scala
@@ -118,7 +118,7 @@ trait ReactScriptsModule extends TypeScriptModule {
   }
 
   override def forkEnv =
-    Task.Anon {
+    Task {
       Map("NODE_PATH" -> Seq(
         ".",
         compile()._1.path,

diff --git a/main/src/mill/main/SelectiveExecutionModule.scala b/main/src/mill/main/SelectiveExecutionModule.scala
@@ -57,7 +57,7 @@ trait SelectiveExecutionModule extends mill.define.Module {
         } match {
           case Left(err) => Result.Failure(err)
           case Right((watched, Left(err))) => Result.Failure(err)
-          case Right((watched, Right(res))) => Result.Success(res)
+          case Right((watched, Right(res))) => Result.Success(())
         }
       }
     }

diff --git a/main/src/mill/main/TokenReaders.scala b/main/src/mill/main/TokenReaders.scala
@@ -69,5 +69,5 @@ trait TokenReaders0 {
     case t: TokensReader.Leftover[_, _] => new LeftoverTaskTokenReader[T](t)
   }
 
-  def given = () // dummy for scala 2/3 compat
+  def `given` = () // dummy for scala 2/3 compat
 }
diff --git a/main/util/src/mill/util/SpanningForest.scala b/main/util/src/mill/util/SpanningForest.scala
@@ -78,11 +78,13 @@ private[mill] object SpanningForest {
 
     while (queued.nonEmpty) {
       val current = queued.dequeue()
-      seen.add(current)
       seenList.append(current)
 
-      for (next <- edges(current).iterator) {
-        if (!seen.contains(next)) queued.enqueue(next)
+      for (next <- edges(current)) {
+        if (!seen.contains(next)) {
+          seen.add(next)
+          queued.enqueue(next)
+        }
       }
     }
     seenList.toSeq

diff --git a/main/util/test/src/mill/util/SpanningForestTests.scala b/main/util/test/src/mill/util/SpanningForestTests.scala
@@ -13,8 +13,8 @@ object SpanningForestTests extends TestSuite {
           Array(1),
           Array(2),
           Array(3),
-          Array(),
-          Array()
+          Array[Int](),
+          Array[Int]()
         ),
         Set(0),
         limitToImportantVertices = false