.

Author: lihaoyi

project/Build.scala

@@ -1224,8 +1224,7 @@ object Build {
 
           val scalaFiles = (dest ** "*.scala").get
 
-          // Define patches as a map from search text to replacement text
-          val patches = Map(
+          val patches = Map( // Define patches as a map from search text to replacement text
             "import scala" -> "import _root_.scala",
             " scala.collection." -> " _root_.scala.collection.",
             "def apply(c: Char): Trie[T]" -> "def apply(c: Char): Trie[T] | Null",
@@ -1245,11 +1244,9 @@ object Build {
               var processedText = "package dotty.shaded\n" + text
 
               // Apply patches and count usage
-              patches.foreach { case (search, replacement) =>
-                if (processedText.contains(search)) {
-                  processedText = processedText.replace(search, replacement)
-                  patchUsageCounter(search) += 1
-                }
+              for((search, replacement) <- patches if processedText.contains(search)){
+                processedText = processedText.replace(search, replacement)
+                patchUsageCounter(search) += 1
               }
 
               IO.write(file, processedText)

repl/test/dotty/tools/repl/ReplCompilerTests.scala

@@ -78,7 +78,7 @@ class ReplCompilerTests extends ReplTest:
       assertEquals(1, summon[State].imports.size)
       run("""mutable.Map("one" -> 1)""")
       assertEquals(
-        "val res0: scala.collection.mutable.Map[String, Int] = HashMap(one -> 1)",
+        "val res0: scala.collection.mutable.Map[String, Int] = HashMap(\"one\" -> 1)",
         storedOutput().trim
       )
     }