Merge pull request scala#10785 from scala-steward/update/scala3-compiler_3-3.4.2

Update scala3-compiler_3, ... to 3.4.2

Author: SethTisue

project/DottySupport.scala

@@ -12,7 +12,7 @@ import sbt.librarymanagement.{
   * Settings to support validation of TastyUnpickler against the release of dotty with the matching TASTy version
   */
 object TastySupport {
-  val supportedTASTyRelease = "3.4.1" // TASTY: 28.4-0
+  val supportedTASTyRelease = "3.4.2" // TASTY: 28.4-0
   val scala3Compiler = "org.scala-lang" % "scala3-compiler_3" % supportedTASTyRelease
   val scala3Library = "org.scala-lang" % "scala3-library_3" % supportedTASTyRelease
 

src/tastytest/scala/tools/tastytest/Diff.scala

@@ -16,8 +16,18 @@ import scala.jdk.CollectionConverters._
 import com.github.difflib.{DiffUtils, UnifiedDiffUtils}
 
 object Diff {
+  def removeTrailing(str: String): String = {
+    val lastWhitespace = str.reverseIterator.indexWhere(!_.isWhitespace)
+    if (lastWhitespace == -1) str
+    else str.dropRight(lastWhitespace)
+  }
+
+
   def splitIntoLines(string: String): Seq[String] =
-    string.trim.linesIterator.toSeq
+    string.linesIterator.map(removeTrailing).toSeq
+
+  def splitIntoLines(stream: java.util.stream.Stream[String]): Seq[String] =
+    stream.map(removeTrailing).iterator().asScala.toSeq
 
   def compareContents(output: String, check: String): String =
     compareContents(splitIntoLines(output), splitIntoLines(check))

src/tastytest/scala/tools/tastytest/Files.scala

@@ -78,14 +78,12 @@ object Files {
   }
 
   def processLines[A](file: String)(op: ju.stream.Stream[String] => A): A = {
-    var stream: java.util.stream.Stream[String] = null
-    try {
-      stream = JFiles.lines(JPaths.get(file))
+    val stream: java.util.stream.Stream[String] = JFiles.lines(JPaths.get(file))
+    try
       op(stream)
-    }
-    finally if (stream != null) {
+    finally
       stream.close()
-    }
+
   }
 
   def use[T](resource: String)(op: jl.Iterable[String] => Try[T]): Try[T] = Try {

src/tastytest/scala/tools/tastytest/TastyTest.scala

@@ -311,7 +311,7 @@ object TastyTest {
             printerrln(s"ERROR: $source did not compile when expected to. Perhaps it should match (**/*${ScalaFail.name})")
           case Some((Some(checkFile), _)) if Check.permits(checkFile) =>
             processLines(checkFile) { stream =>
-              val checkLines  = stream.iterator().asScala.toSeq
+              val checkLines  = Diff.splitIntoLines(stream)
               val outputLines = Diff.splitIntoLines(output)
               val diff        = Diff.compareContents(outputLines, checkLines)
               if (diff.nonEmpty) {

test/tasty/neg-full-circle/src-3-app/TestExperimentalDefsPre.check

@@ -1,17 +1,41 @@
 -- Error: TestExperimentalDefsPre_fail.scala:1:18
 1 |import downstream.ExperimentalDefsPre.*
   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  |object ExperimentalDefsPre is marked @experimental and therefore may only be used in an experimental scope.
+  |       Experimental definition may only be used under experimental mode:
+  |         1. in a definition marked as @experimental, or
+  |         2. compiling with the -experimental compiler flag, or
+  |         3. with a nightly or snapshot version of the compiler.
+  |
+  |       object ExperimentalDefsPre is marked @experimental
+  |
 -- Error: TestExperimentalDefsPre_fail.scala:4:10
 4 |  def test = new SubExperimentalNotExperimental
   |          ^
-  |object ExperimentalDefsPre is marked @experimental and therefore may only be used in an experimental scope.
+  |         Experimental definition may only be used under experimental mode:
+  |           1. in a definition marked as @experimental, or
+  |           2. compiling with the -experimental compiler flag, or
+  |           3. with a nightly or snapshot version of the compiler.
+  |
+  |         object ExperimentalDefsPre is marked @experimental
+  |
 -- Error: TestExperimentalDefsPre_fail.scala:4:17
 4 |  def test = new SubExperimentalNotExperimental
   |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  |object ExperimentalDefsPre is marked @experimental and therefore may only be used in an experimental scope.
+  |         Experimental definition may only be used under experimental mode:
+  |           1. in a definition marked as @experimental, or
+  |           2. compiling with the -experimental compiler flag, or
+  |           3. with a nightly or snapshot version of the compiler.
+  |
+  |         object ExperimentalDefsPre is marked @experimental
+  |
 -- Error: TestExperimentalDefsPre_fail.scala:6:35
 6 |  class SubSubExperimental extends SubExperimentalNotExperimental
   |                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  |object ExperimentalDefsPre is marked @experimental and therefore may only be used in an experimental scope.
+  |         Experimental definition may only be used under experimental mode:
+  |           1. in a definition marked as @experimental, or
+  |           2. compiling with the -experimental compiler flag, or
+  |           3. with a nightly or snapshot version of the compiler.
+  |
+  |         object ExperimentalDefsPre is marked @experimental
+  |
 4 errors found

test/tasty/neg-pipelined/src-2/tastytest/TestRawTypes.check

@@ -1,22 +1,22 @@
 TestRawTypes_fail.scala:15: error: type mismatch;
  found   : lib.RawTypes#C[String]#D[String]
  required: lib.RawTypes#C[T]#D[_]
-Note: String <: Object, but Java-defined class D is invariant in type U.
-You may wish to investigate a wildcard type such as `_ <: Object`. (SLS 3.2.10)
+Note: String <: Any, but Java-defined class D is invariant in type U.
+You may wish to investigate a wildcard type such as `_ <: Any`. (SLS 3.2.10)
   RawTypes.mii_Raw_Raw(cd_ii) // error
                        ^
 TestRawTypes_fail.scala:16: error: type mismatch;
  found   : lib.RawTypes#C[String]#D[String]#E[String]
  required: lib.RawTypes#C[T]#D[U]#E[_]
-Note: String <: Object, but Java-defined class E is invariant in type V.
-You may wish to investigate a wildcard type such as `_ <: Object`. (SLS 3.2.10)
+Note: String <: Any, but Java-defined class E is invariant in type V.
+You may wish to investigate a wildcard type such as `_ <: Any`. (SLS 3.2.10)
   RawTypes.miii_Raw_Raw_Raw(cde_iii) // error
                             ^
 TestRawTypes_fail.scala:18: error: type mismatch;
  found   : lib.RawTypes.CStatic[String]#D[String]
  required: lib.RawTypes.CStatic[T]#D[_]
-Note: String <: Object, but Java-defined class D is invariant in type U.
-You may wish to investigate a wildcard type such as `_ <: Object`. (SLS 3.2.10)
+Note: String <: Any, but Java-defined class D is invariant in type U.
+You may wish to investigate a wildcard type such as `_ <: Any`. (SLS 3.2.10)
   RawTypes.msi_Raw_Raw(cd_si) // error
                        ^
 3 errors