Merge pull request #1600 from xuwei-k/scala-3-project-Werror

fix all warnings in Scala 3 projects

Author: eed3si9n

build.sbt

@@ -91,6 +91,16 @@ def baseSettings: Seq[Setting[?]] = Seq(
   testFrameworks += new TestFramework("verify.runner.Framework"),
   compile / javacOptions ++= Seq("-Xlint", "-Xlint:-serial"),
   Test / publishArtifact := false,
+  Compile / compile / scalacOptions ++= {
+    scalaBinaryVersion.value match {
+      case "3" =>
+        Seq(
+          "-Werror",
+        )
+      case _ =>
+        Nil
+    }
+  },
   scalacOptions += {
     scalaBinaryVersion.value match {
       case "2.10" | "2.11" =>

internal/compiler-bridge-test/src/test/scala/sbt/internal/inc/CompilingSpecification.scala

@@ -120,7 +120,7 @@ trait CompilingSpecification extends AbstractBridgeProviderTestkit {
    * Only the names used in the last src file are returned.
    */
   def extractUsedNamesFromSrc(sources: String*): Map[String, Set[String]] = {
-    val (srcFiles, analysisCallback) = compileSrcs(sources: _*)
+    val (srcFiles, analysisCallback) = compileSrcs(sources*)
     srcFiles
       .map { srcFile =>
         val classesInSrc = analysisCallback.classNames(srcFile).map(_._1)
@@ -134,7 +134,7 @@ trait CompilingSpecification extends AbstractBridgeProviderTestkit {
    * dependencies between snippets.
    */
   def extractDependenciesFromSrcs(srcs: String*): ExtractedClassDependencies = {
-    val (_, testCallback) = compileSrcs(srcs: _*)
+    val (_, testCallback) = compileSrcs(srcs*)
 
     val memberRefDeps = testCallback.classDependencies.toList collect {
       case (target, src, DependencyByMemberRef) => (src, target)
@@ -158,7 +158,7 @@ trait CompilingSpecification extends AbstractBridgeProviderTestkit {
     ) ++ sys.env
       .get("LOCALAPPDATA")
       .map(s => "C_CACHE4" -> Paths.get(s.replace('\\', '/'), "Coursier/cache/v1"))
-      .toList: _*
+      .toList*
   )
 
   lazy val emptyChanges: DependencyChanges = new DependencyChanges {

internal/compiler-bridge-test/src/test/scala/sbt/internal/inc/ExtractUsedNamesSpecification.scala

@@ -236,7 +236,7 @@ class ExtractUsedNamesSpecification
 
     def findPatMatUsages(in: String): Set[String] = {
       val (_, callback) = compileSrcs(List(List(sealedClass, in)))
-      val clientNames = callback.usedNamesAndScopes.filterKeys(!_.startsWith("base."))
+      val clientNames = callback.usedNamesAndScopes.view.filterKeys(!_.startsWith("base.")).toMap
 
       val names = clientNames.flatMap {
         case (_, usages) =>

internal/zinc-apiinfo/src/main/scala/xsbt/api/SameAPI.scala

@@ -101,7 +101,8 @@ class SameAPI(includePrivate: Boolean, includeParamNames: Boolean) {
   ): Boolean =
     debug(
       sameStrings(a.keySet, b.keySet),
-      "\tDefinition strings differed (a: " + (a.keySet -- b.keySet) + ", b: " + (b.keySet -- a
+      "\tDefinition strings differed (a: " + (a.keySet.toSet -- b.keySet) + ", b: " + (b.keySet
+        .toSet -- a
         .keySet) + ")"
     ) &&
       zippedEntries(a, b).forall(tupled(sameNamedDefinitions))

internal/zinc-apiinfo/src/test/scala/sbt/internal/inc/ClassCanonicalNameSpec.scala

@@ -116,7 +116,7 @@ class ClassCanonicalNameSpec extends AnyFlatSpec with Matchers with Diagrams {
   // Strip the shared prefix to the class name
   def strip(s: String) = {
     val prefix = "sbt.internal.inc.p"
-    if (s startsWith prefix) s stripPrefix prefix drop 2
+    if (s.startsWith(prefix)) s stripPrefix prefix drop 2
     else s
   }
 }

internal/zinc-apiinfo/src/test/scala/xsbt/api/NameHashingSpecification.scala

@@ -105,8 +105,8 @@ class NameHashingSpecification extends UnitSpec {
     val nameHashes2 = nameHashing.nameHashes(classBar2)
     assertNameHashEqualForRegularName("Bar", nameHashes1, nameHashes2)
     assertNameHashEqualForRegularName("foo", nameHashes1, nameHashes2)
-    nameHashes1 namesIn UseScope.Default should not contain "bar"
-    nameHashes2 namesIn UseScope.Default should contain("bar")
+    nameHashes1.namesIn(UseScope.Default) should not contain "bar"
+    nameHashes2.namesIn(UseScope.Default) should contain("bar")
   }
 
   /**

internal/zinc-classpath/src/main/scala/sbt/internal/inc/classpath/ClasspathUtilities.scala

@@ -180,7 +180,7 @@ object ClasspathUtil {
     makeString(paths, java.io.File.pathSeparator)
   private[sbt] def makeString(paths: Seq[Path], sep: String): String = {
     val separated = paths.map(_.toAbsolutePath.toString)
-    separated.find(_ contains sep).foreach(p => sys.error(s"Path '$p' contains separator '$sep'"))
+    separated.find(_.contains(sep)).foreach(p => sys.error(s"Path '$p' contains separator '$sep'"))
     separated.mkString(sep)
   }
 
@@ -200,9 +200,9 @@ object ClasspathUtil {
     }
     val basePath = toAbsolutePath(base).normalize
     val filePath = toAbsolutePath(file).normalize
-    if (filePath startsWith basePath) {
+    if (filePath.startsWith(basePath)) {
       val relativePath =
-        catching(classOf[IllegalArgumentException]) opt (basePath relativize filePath)
+        catching(classOf[IllegalArgumentException]) opt (basePath.relativize(filePath))
       relativePath map (_.toString)
     } else None
   }

internal/zinc-compile-core/src/main/scala/sbt/internal/inc/javac/JavaErrorParser.scala

@@ -173,7 +173,7 @@ class JavaErrorParser(relativeDir: File = new File(new File(".").getAbsolutePath
   private def findFileSource(f: String): String = {
     // If a file looks like an absolute path, leave it as is.
     def isAbsolute(f: String) =
-      (f startsWith "/") || (f matches """[^\\]+:\\.*""")
+      (f.startsWith("/")) || (f.matches("""[^\\]+:\\.*"""))
     // TODO - we used to use existence checks, that may be the right way to go
     if (isAbsolute(f)) f
     else (new File(relativeDir, f)).getAbsolutePath

internal/zinc-compile-core/src/main/scala/sbt/internal/inc/javac/LocalJava.scala

@@ -295,7 +295,7 @@ final class LocalJavaCompiler(compiler: javax.tools.JavaCompiler) extends XJavaC
     val diagnostics = new DiagnosticsReporter(reporter)
 
     /* Local Java compiler doesn't accept `-J<flag>` options, strip them. */
-    val (invalidOptions, cleanedOptions) = options partition (_ startsWith "-J")
+    val (invalidOptions, cleanedOptions) = options partition (_.startsWith("-J"))
     if (invalidOptions.nonEmpty) {
       log.warn("Javac is running in 'local' mode. These flags have been removed:")
       log.warn(invalidOptions.mkString("\t", ", ", ""))

internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavaCompilerSpec.scala

@@ -190,7 +190,7 @@ class JavaCompilerSpec extends UnitSpec with Diagrams {
   }
 
   def messageMatches(p: Problem, lineno: Int, message: Option[String] = None): Boolean = {
-    def messageCheck = message forall (message => p.message contains message)
+    def messageCheck = message forall (message => p.message.contains(message))
     def lineNumberCheck = p.position.line.isPresent && (p.position.line.get == lineno)
     lineNumberCheck && messageCheck
   }
@@ -201,7 +201,7 @@ class JavaCompilerSpec extends UnitSpec with Diagrams {
       colno: Int,
       lineContent: Option[String] = None
   ): Boolean = {
-    def lineContentCheck = lineContent forall (content => p.position.lineContent contains content)
+    def lineContentCheck = lineContent forall (content => p.position.lineContent.contains(content))
     def lineNumberCheck = p.position.line.isPresent && (p.position.line.get == lineno)
     def columnCheck = p.position.pointer.isPresent && (p.position.pointer.get == colno)
     lineNumberCheck && columnCheck && lineContentCheck