NIT Fix more miscellaneous warnings (#3920)

Author: Gedochao

modules/build-macros/src/main/scala/scala/build/EitherCps.scala

@@ -1,13 +1,13 @@
 package scala.build
 
-final case class EitherFailure[E](v: E, cps: EitherCps[_]) extends RuntimeException:
+final case class EitherFailure[E](v: E, cps: EitherCps[?]) extends RuntimeException:
   override def fillInStackTrace() = this // disable stack trace generation
 
 class EitherCps[E]
 
 object EitherCps:
   def value[E, V](using
-    cps: EitherCps[_ >: E]
+    cps: EitherCps[? >: E]
   )(from: Either[E, V]) = // Adding a context bounds breaks incremental compilation
     from match
       case Left(e)  => throw EitherFailure(e, cps)

modules/build/src/main/scala/scala/build/Build.scala

@@ -22,6 +22,7 @@ import scala.build.options.validation.ValidationException
 import scala.build.postprocessing.*
 import scala.build.postprocessing.LineConversion.scalaLineToScLineShift
 import scala.collection.mutable.ListBuffer
+import scala.compiletime.uninitialized
 import scala.concurrent.duration.DurationInt
 import scala.util.Properties
 import scala.util.control.NonFatal
@@ -1303,7 +1304,7 @@ object Build {
     }
 
     private val lock                  = new Object
-    private var f: ScheduledFuture[?] = _
+    private var f: ScheduledFuture[?] = uninitialized
     private val waitFor               = 50.millis
     private val runnable: Runnable    = { () =>
       lock.synchronized {

modules/build/src/main/scala/scala/build/CrossSources.scala

@@ -52,7 +52,7 @@ final case class CrossSources(
     buildOptions
       .filter(_.requirements.isEmpty)
       .map(_.value)
-      .foldLeft(baseOptions)(_ orElse _)
+      .foldLeft(baseOptions)(_.orElse(_))
 
   private def needsScalaVersion =
     paths.exists(_.needsScalaVersion) ||
@@ -80,7 +80,7 @@ final case class CrossSources(
           .flatMap(_.withScalaVersion(retainedScalaVersion).toSeq)
           .filter(_.requirements.isEmpty)
           .map(_.value)
-          .foldLeft(sharedOptions0)(_ orElse _)
+          .foldLeft(sharedOptions0)(_.orElse(_))
 
         val platform = buildOptionsWithScalaVersion.platform
 
@@ -246,7 +246,7 @@ object CrossSources {
         scopedRequirementsByRoot
           .getOrElse(path.root, Nil)
           .flatMap(_.valueFor(path).toSeq)
-          .foldLeft(BuildRequirements())(_ orElse _)
+          .foldLeft(BuildRequirements())(_.orElse(_))
 
       // Scala CLI treats all `.test.scala` files tests as well as
       // files from within `test` subdirectory from provided input directories
@@ -266,7 +266,7 @@ object CrossSources {
     } yield {
       val baseReqs0 = baseReqs(preprocessedSource.scopePath)
       preprocessedSource.optionsWithTargetRequirements :+ WithBuildRequirements(
-        preprocessedSource.requirements.fold(baseReqs0)(_ orElse baseReqs0),
+        preprocessedSource.requirements.fold(baseReqs0)(_.orElse(baseReqs0)),
         opts
       )
     }).flatten
@@ -281,7 +281,7 @@ object CrossSources {
         case d: PreprocessedSource.OnDisk =>
           val baseReqs0 = baseReqs(d.scopePath)
           WithBuildRequirements(
-            d.requirements.fold(baseReqs0)(_ orElse baseReqs0),
+            d.requirements.fold(baseReqs0)(_.orElse(baseReqs0)),
             (d.path, d.path.relativeTo(allInputs.workspace))
           ) -> d.directivesPositions
       }
@@ -291,7 +291,7 @@ object CrossSources {
         case m: PreprocessedSource.InMemory =>
           val baseReqs0 = baseReqs(m.scopePath)
           WithBuildRequirements(
-            m.requirements.fold(baseReqs0)(_ orElse baseReqs0),
+            m.requirements.fold(baseReqs0)(_.orElse(baseReqs0)),
             Sources.InMemory(m.originalPath, m.relPath, m.content, m.wrapperParamsOpt)
           ) -> m.directivesPositions
       }
@@ -301,7 +301,7 @@ object CrossSources {
         case m: PreprocessedSource.UnwrappedScript =>
           val baseReqs0 = baseReqs(m.scopePath)
           WithBuildRequirements(
-            m.requirements.fold(baseReqs0)(_ orElse baseReqs0),
+            m.requirements.fold(baseReqs0)(_.orElse(baseReqs0)),
             Sources.UnwrappedScript(m.originalPath, m.relPath, m.wrapScriptFun)
           ) -> m.directivesPositions
       }

modules/build/src/main/scala/scala/build/Project.scala

@@ -116,7 +116,7 @@ final case class Project(
 
   def writeBloopFile(strictCheck: Boolean, logger: Logger): Boolean = {
     lazy val bloopFileContent =
-      writeAsJsonToArray(bloopFile)(BloopCodecs.codecFile)
+      writeAsJsonToArray(bloopFile)(using BloopCodecs.codecFile)
     val dest    = directory / ".bloop" / s"$projectName.json"
     val doWrite =
       if (strictCheck)

modules/build/src/main/scala/scala/build/ScopedSources.scala

@@ -121,7 +121,7 @@ final case class ScopedSources(
     */
   def combinedBuildOptions(scope: Scope, baseOptions: BuildOptions): BuildOptions =
     buildOptionsFor(scope)
-      .foldRight(baseOptions)(_ orElse _)
+      .foldRight(baseOptions)(_.orElse(_))
 
   def buildInfo(baseOptions: BuildOptions, workspace: os.Path): Either[BuildException, BuildInfo] =
     either {

modules/build/src/main/scala/scala/build/bsp/BspImpl.scala

@@ -24,6 +24,7 @@ import scala.build.input.{Inputs, ScalaCliInvokeData}
 import scala.build.internal.Constants
 import scala.build.options.{BuildOptions, Scope}
 import scala.collection.mutable.ListBuffer
+import scala.compiletime.uninitialized
 import scala.concurrent.duration.DurationInt
 import scala.concurrent.{ExecutionContext, Future, Promise}
 import scala.jdk.CollectionConverters.*
@@ -55,9 +56,9 @@ final class BspImpl(
 
   private val shownGlobalMessages =
     new java.util.concurrent.ConcurrentHashMap[String, Unit]()
-  private var actualLocalClient: BspClient                     = _
-  private var localClient: b.BuildClient with BloopBuildClient = _
-  private val bloopSession                                     = new BloopSession.Reference
+  private var actualLocalClient: BspClient                  = uninitialized
+  private var localClient: b.BuildClient & BloopBuildClient = uninitialized
+  private val bloopSession                                  = new BloopSession.Reference
 
   /** Sends the buildTarget/didChange BSP notification to the BSP client, indicating that the build
     * targets defined in the current session have changed.
@@ -386,7 +387,7 @@ final class BspImpl(
     * @return
     *   BSP client
     */
-  private def getLocalClient(verbosity: Int): b.BuildClient with BloopBuildClient =
+  private def getLocalClient(verbosity: Int): b.BuildClient & BloopBuildClient =
     if (verbosity >= 3)
       new BspImpl.LoggingBspClient(actualLocalClient)
     else
@@ -464,22 +465,18 @@ final class BspImpl(
     val currentBloopSession = newBloopSession(initialInputs, initialBspOptions)
     bloopSession.update(null, currentBloopSession, "BSP server already initialized")
 
-    val actualLocalServer: b.BuildServer
-      with b.ScalaBuildServer
-      with b.JavaBuildServer
-      with b.JvmBuildServer
-      with ScalaScriptBuildServer
-      with HasGeneratedSources = new BuildServerProxy(
-      () => bloopSession.get().bspServer,
-      () => onReload()
-    )
+    val actualLocalServer: b.BuildServer & b.ScalaBuildServer & b.JavaBuildServer & b.JvmBuildServer
+      & ScalaScriptBuildServer & HasGeneratedSources =
+      new BuildServerProxy(
+        () => bloopSession.get().bspServer,
+        () => onReload()
+      )
 
-    val localServer: b.BuildServer with b.ScalaBuildServer with b.JavaBuildServer
-      with b.JvmBuildServer with ScalaScriptBuildServer =
-      if (verbosity >= 3)
-        new LoggingBuildServerAll(actualLocalServer)
-      else
-        actualLocalServer
+    val localServer: b.BuildServer & b.ScalaBuildServer & b.JavaBuildServer & b.JvmBuildServer
+      & ScalaScriptBuildServer =
+      if verbosity >= 3
+      then new LoggingBuildServerAll(actualLocalServer)
+      else actualLocalServer
 
     val launcher = new jsonrpc.Launcher.Builder[b.BuildClient]()
       .setExecutorService(threads.buildThreads.bloop.jsonrpc) // FIXME No
@@ -530,10 +527,10 @@ final class BspImpl(
 
     val es      = ExecutionContext.fromExecutorService(threads.buildThreads.bloop.jsonrpc)
     val futures = Seq(
-      BspImpl.naiveJavaFutureToScalaFuture(f).map(_ => ())(es),
+      BspImpl.naiveJavaFutureToScalaFuture(f).map(_ => ())(using es),
       currentBloopSession.bspServer.initiateShutdown
     )
-    Future.firstCompletedOf(futures)(es)
+    Future.firstCompletedOf(futures)(using es)
   }
 
   /** Shuts down the current Bloop session */
@@ -592,7 +589,7 @@ final class BspImpl(
             // RelodableOptions don't take into account buildOptions from sources
             val updatedReloadableOptions = reloadableOptions.copy(
               buildOptions =
-                reloadableOptions.buildOptions orElse preBuildProject.mainScope.buildOptions,
+                reloadableOptions.buildOptions.orElse(preBuildProject.mainScope.buildOptions),
               bloopRifleConfig = reloadableOptions.bloopRifleConfig.copy(
                 javaPath = projectJavaHome.javaCommand,
                 minimumBloopJvm = projectJavaHome.version
@@ -643,7 +640,7 @@ final class BspImpl(
     if (os.isFile(ideInputsJsonPath)) {
       val maybeResponse = either[BuildException] {
         val ideInputs = value {
-          try Right(readFromArray(os.read.bytes(ideInputsJsonPath))(IdeInputs.codec))
+          try Right(readFromArray(os.read.bytes(ideInputsJsonPath))(using IdeInputs.codec))
           catch {
             case e: JsonReaderException =>
               logger.debug(s"Caught $e while decoding $ideInputsJsonPath")

modules/build/src/main/scala/scala/build/bsp/LoggingBuildServerAll.scala

@@ -5,8 +5,7 @@ import ch.epfl.scala.bsp4j as b
 import java.util.concurrent.CompletableFuture
 
 class LoggingBuildServerAll(
-  val underlying: b.BuildServer with b.ScalaBuildServer with b.JavaBuildServer with b.JvmBuildServer
-    with ScalaScriptBuildServer
+  val underlying: b.BuildServer & b.ScalaBuildServer & b.JavaBuildServer & b.JvmBuildServer & ScalaScriptBuildServer
 ) extends LoggingBuildServer with LoggingScalaBuildServer with LoggingJavaBuildServer
     with LoggingJvmBuildServer
     with ScalaScriptBuildServer {

modules/build/src/main/scala/scala/build/internal/Runner.scala

@@ -87,7 +87,7 @@ object Runner {
       sys.error("should not happen")
     }
     else {
-      val b = new ProcessBuilder(command: _*)
+      val b = new ProcessBuilder(command*)
         .inheritIO()
 
       if (!inheritStreams) {
@@ -332,7 +332,7 @@ object Runner {
       sys.error("should not happen")
     }
     else {
-      val builder = new ProcessBuilder(command: _*)
+      val builder = new ProcessBuilder(command*)
         .inheritIO()
       val env = builder.environment()
       for ((k, v) <- extraEnv)

modules/build/src/main/scala/scala/build/internal/util/WarningMessages.scala

@@ -83,12 +83,12 @@ object WarningMessages {
   ): String =
     powerFeatureUsedInSip(optionName, "option", specificationLevel)
 
-  def powerConfigKeyUsedInSip(key: Key[_])(using ScalaCliInvokeData): String =
+  def powerConfigKeyUsedInSip(key: Key[?])(using ScalaCliInvokeData): String =
     powerFeatureUsedInSip(key.fullName, "configuration key", key.specificationLevel)
 
   def powerDirectiveUsedInSip(
     directive: ScopedDirective,
-    handler: DirectiveHandler[_]
+    handler: DirectiveHandler[?]
   )(using ScalaCliInvokeData): String =
     powerFeatureUsedInSip(
       directive.directive.toString,

modules/build/src/main/scala/scala/build/preprocessing/ExtractedDirectives.scala

@@ -65,7 +65,7 @@ object ExtractedDirectives {
       }
 
       val strictDirectives = directivesOpt.toSeq.flatMap { directives =>
-        def toStrictValue(value: UsingValue): Seq[Value[_]] = value match {
+        def toStrictValue(value: UsingValue): Seq[Value[?]] = value match {
           case uvs: UsingValues   => uvs.values.asScala.toSeq.flatMap(toStrictValue)
           case el: EmptyLiteral   => Seq(EmptyValue(el))
           case sl: StringLiteral  => Seq(StringValue(sl.getValue(), sl))