From 5d660ab8b54b3a8e22218aacc2993fed3e61968a Mon Sep 17 00:00:00 2001
From: xuwei-k <6b656e6a69@gmail.com>
Date: Sat, 22 Feb 2025 08:45:18 +0900
Subject: [PATCH] remove unnecessary `case`

- https://github.com/xuwei-k/scalafix-rules/blob/3ca36335057154ef4431fee464a86b721013d334/rules/src/main/scala/fix/RemoveParameterUntuplingCase.scala
- https://docs.scala-lang.org/scala3/reference/other-new-features/parameter-untupling.html
- https://docs.scala-lang.org/scala3/reference/other-new-features/parameter-untupling-spec.html
---
 .../sbt/internal/EvaluateConfigurations.scala | 10 +-
 .../sbt/internal/parser/SbtRefactorings.scala |  2 +-
 .../internal/parser/CheckIfParsedSpec.scala   |  2 +-
 .../internal/parser/SessionSettingsSpec.scala |  2 +-
 .../internal/util/appmacro/ContextUtil.scala  |  2 +-
 .../sbt/internal/util/complete/History.scala  |  2 +-
 .../util/complete/HistoryCommands.scala       |  6 +-
 .../sbt/internal/util/complete/Parsers.scala  |  6 +-
 .../internal/util/complete/SizeParser.scala   |  2 +-
 .../main/scala/sbt/util/LoggerContext.scala   |  6 +-
 .../scala/sbt/internal/util/Relation.scala    | 10 +-
 .../src/test/scala/RelationTest.scala         |  8 +-
 .../sbt/internal/scripted/FileCommands.scala  |  2 +-
 .../DependencyResolution.scala                |  4 +-
 .../sbt/librarymanagement/EvictionError.scala |  2 +-
 .../sbt/librarymanagement/ModuleIDExtra.scala |  2 +-
 .../librarymanagement/UnresolvedWarning.scala |  2 +-
 .../librarymanagement/UpdateReportExtra.scala |  2 +-
 .../CoursierDependencyResolution.scala        | 14 +--
 .../src/main/scala/lmcoursier/FromSbt.scala   |  6 +-
 .../src/main/scala/lmcoursier/Inputs.scala    |  4 +-
 .../src/main/scala/lmcoursier/IvyXml.scala    | 14 +--
 .../lmcoursier/definitions/ToCoursier.scala   | 14 +--
 .../lmcoursier/internal/ArtifactsRun.scala    |  2 +-
 .../lmcoursier/internal/ResolutionRun.scala   |  2 +-
 .../lmcoursier/internal/SbtUpdateReport.scala | 24 ++---
 .../TemporaryInMemoryRepository.scala         |  2 +-
 .../scala/lmcoursier/internal/UpdateRun.scala |  8 +-
 .../librarymanagement/ConvertResolver.scala   |  2 +-
 .../librarymanagement/CustomPomParser.scala   |  2 +-
 .../sbt/internal/librarymanagement/Ivy.scala  |  2 +-
 .../librarymanagement/IvyActions.scala        |  6 +-
 .../CachedResolutionResolveEngine.scala       | 12 +--
 .../ivyint/SbtChainResolver.scala             |  4 +-
 .../librarymanagement/ivy/Credentials.scala   |  2 +-
 main-actions/src/main/scala/sbt/Mapper.scala  |  4 +-
 main-actions/src/main/scala/sbt/Pkg.scala     | 10 +-
 main-actions/src/main/scala/sbt/Sync.scala    |  6 +-
 .../src/main/scala/sbt/TestResultLogger.scala |  2 +-
 main-actions/src/main/scala/sbt/Tests.scala   |  6 +-
 .../src/test/scala/sbt/MapperTest.scala       |  8 +-
 .../src/main/scala/sbt/BasicCommands.scala    |  4 +-
 main-command/src/main/scala/sbt/Command.scala |  2 +-
 .../src/main/scala/sbt/CommandUtil.scala      |  6 +-
 .../internal/classpath/ClassLoaderCache.scala |  4 +-
 .../sbt/internal/client/NetworkClient.scala   |  4 +-
 .../util/ReadJsonFromInputStream.scala        |  2 +-
 .../src/main/scala/sbt/InputTask.scala        |  2 +-
 .../src/main/scala/sbt/Plugins.scala          |  2 +-
 .../src/main/scala/sbt/Previous.scala         |  4 +-
 main-settings/src/main/scala/sbt/Scope.scala  |  5 +-
 .../src/main/scala/sbt/std/Instances.scala    |  6 +-
 main/src/main/scala/sbt/Cross.scala           | 18 ++--
 main/src/main/scala/sbt/Defaults.scala        | 92 +++++++++----------
 main/src/main/scala/sbt/Main.scala            |  2 +-
 main/src/main/scala/sbt/Opts.scala            |  2 +-
 main/src/main/scala/sbt/PluginCross.scala     |  2 +-
 main/src/main/scala/sbt/ProjectExtra.scala    |  2 +-
 main/src/main/scala/sbt/ProjectMatrix.scala   |  2 +-
 main/src/main/scala/sbt/RemoteCache.scala     |  8 +-
 main/src/main/scala/sbt/ScopeFilter.scala     |  4 +-
 .../main/scala/sbt/TemplateCommandUtil.scala  |  2 +-
 .../sbt/coursierint/CoursierInputsTasks.scala |  8 +-
 .../CoursierRepositoriesTasks.scala           |  2 +-
 .../scala/sbt/coursierint/LMCoursier.scala    |  2 +-
 .../main/scala/sbt/internal/BuildLoader.scala |  2 +-
 .../scala/sbt/internal/BuildStructure.scala   |  4 +-
 .../scala/sbt/internal/ClasspathImpl.scala    |  2 +-
 main/src/main/scala/sbt/internal/Clean.scala  |  2 +-
 .../main/scala/sbt/internal/Continuous.scala  |  9 +-
 .../main/scala/sbt/internal/CrossJava.scala   | 24 ++---
 .../sbt/internal/FastTrackCommands.scala      |  2 +-
 .../scala/sbt/internal/IncrementalTest.scala  |  4 +-
 .../src/main/scala/sbt/internal/Inspect.scala |  2 +-
 .../scala/sbt/internal/JarClassPath.scala     |  2 +-
 .../sbt/internal/LibraryManagement.scala      | 48 +++++-----
 main/src/main/scala/sbt/internal/Load.scala   | 12 +--
 .../scala/sbt/internal/PluginDiscovery.scala  |  7 +-
 .../scala/sbt/internal/PluginsDebug.scala     |  2 +-
 .../scala/sbt/internal/ProjectQuery.scala     |  2 +-
 .../scala/sbt/internal/SessionSettings.scala  |  2 +-
 .../sbt/internal/SettingCompletions.scala     | 10 +-
 .../scala/sbt/internal/TaskProgress.scala     |  2 +-
 .../main/scala/sbt/internal/TaskTimings.scala |  4 +-
 .../WatchTransitiveDependencies.scala         |  6 +-
 .../main/scala/sbt/internal/graph/model.scala |  2 +-
 .../graph/rendering/LicenseInfo.scala         |  2 +-
 .../internal/librarymanagement/IvyXml.scala   |  8 +-
 .../internal/server/BuildServerProtocol.scala | 50 +++++-----
 .../sbt/internal/server/Definition.scala      | 12 +--
 .../sbt/internal/server/NetworkChannel.scala  |  6 +-
 main/src/main/scala/sbt/nio/FileStamp.scala   |  4 +-
 main/src/main/scala/sbt/nio/Settings.scala    |  6 +-
 .../sbt/plugins/DependencyTreeSettings.scala  |  2 +-
 .../test/scala/sbt/internal/TestBuild.scala   |  4 +-
 run/src/main/scala/sbt/Fork.scala             |  2 +-
 run/src/main/scala/sbt/SelectMainClass.scala  |  2 +-
 .../sbt/internal/GrpcActionCacheStore.scala   |  2 +-
 .../sbt/scriptedtest/ScriptedTests.scala      |  2 +-
 tasks-standard/src/main/scala/sbt/Task.scala  |  2 +-
 tasks-standard/src/test/scala/Test.scala      |  4 +-
 .../src/test/scala/TestRunnerSort.scala       |  2 +-
 tasks/src/main/scala/sbt/Execute.scala        |  2 +-
 .../src/main/scala/sbt/TestFramework.scala    |  4 +-
 util-cache/src/test/scala/CacheSpec.scala     |  8 +-
 .../src/test/scala/SingletonCacheSpec.scala   |  8 +-
 .../test/scala/sbt/util/ActionCacheTest.scala |  4 +-
 .../main/scala/sbt/internal/util/INode.scala  |  2 +-
 .../main/scala/sbt/internal/util/PMap.scala   |  2 +-
 .../scala/sbt/internal/util/Settings.scala    |  4 +-
 110 files changed, 354 insertions(+), 355 deletions(-)

diff --git a/buildfile/src/main/scala/sbt/internal/EvaluateConfigurations.scala b/buildfile/src/main/scala/sbt/internal/EvaluateConfigurations.scala
index 5c2b7109c..a8e03feb2 100644
--- a/buildfile/src/main/scala/sbt/internal/EvaluateConfigurations.scala
+++ b/buildfile/src/main/scala/sbt/internal/EvaluateConfigurations.scala
@@ -158,7 +158,7 @@ private[sbt] object EvaluateConfigurations {
         (imp, DefinedSbtValues(definitions))
       }
     val allImports = importDefs.map(s => (s, -1)) ++ parsed.imports
-    val dslEntries = parsed.settings map { case (dslExpression, range) =>
+    val dslEntries = parsed.settings map { (dslExpression, range) =>
       evaluateDslEntry(eval, name, allImports, dslExpression, range)
     }
 
@@ -195,10 +195,10 @@ private[sbt] object EvaluateConfigurations {
     p.copy(base = IO.resolve(f, p.base))
 
   def addOffset(offset: Int, lines: Seq[(String, Int)]): Seq[(String, Int)] =
-    lines.map { case (s, i) => (s, i + offset) }
+    lines.map { (s, i) => (s, i + offset) }
 
   def addOffsetToRange(offset: Int, ranges: Seq[(String, LineRange)]): Seq[(String, LineRange)] =
-    ranges.map { case (s, r) => (s, r.shift(offset)) }
+    ranges.map { (s, r) => (s, r.shift(offset)) }
 
   /**
    * The name of the class we cast DSL "setting" (vs. definition) lines to.
@@ -317,7 +317,7 @@ private[sbt] object EvaluateConfigurations {
       definitions: Seq[(String, LineRange)],
       file: Option[VirtualFileRef],
   ): EvalDefinitions = {
-    val convertedRanges = definitions.map { case (s, r) => (s, r.start to r.end) }
+    val convertedRanges = definitions.map { (s, r) => (s, r.start to r.end) }
     eval.evalDefinitions(
       convertedRanges,
       new EvalImports(imports.map(_._1)), // name
@@ -367,7 +367,7 @@ object Index {
     if duplicates.isEmpty then multiMap.collect { case (k, v) if validID(k) => (k, v.head) }.toMap
     else
       val duplicateStr = duplicates
-        .map { case (k, tps) => s"'$k' (${tps.mkString(", ")})" }
+        .map { (k, tps) => s"'$k' (${tps.mkString(", ")})" }
         .mkString(",")
       sys.error(s"Some keys were defined with the same name but different types: $duplicateStr")
   }
diff --git a/buildfile/src/main/scala/sbt/internal/parser/SbtRefactorings.scala b/buildfile/src/main/scala/sbt/internal/parser/SbtRefactorings.scala
index 6817cb85e..278aedc02 100644
--- a/buildfile/src/main/scala/sbt/internal/parser/SbtRefactorings.scala
+++ b/buildfile/src/main/scala/sbt/internal/parser/SbtRefactorings.scala
@@ -85,7 +85,7 @@ private[sbt] object SbtRefactorings:
   private def toTreeStringMap(command: Seq[String]) = {
     val split = SbtParser(FAKE_FILE, command)
     val trees = split.settingsTrees
-    val seq = trees.map { case (statement, tree) =>
+    val seq = trees.map { (statement, tree) =>
       (extractSettingName(tree), statement)
     }
     seq.toMap
diff --git a/buildfile/src/test/scala/sbt/internal/parser/CheckIfParsedSpec.scala b/buildfile/src/test/scala/sbt/internal/parser/CheckIfParsedSpec.scala
index f1f9f3d25..65c6c2605 100644
--- a/buildfile/src/test/scala/sbt/internal/parser/CheckIfParsedSpec.scala
+++ b/buildfile/src/test/scala/sbt/internal/parser/CheckIfParsedSpec.scala
@@ -14,7 +14,7 @@ abstract class CheckIfParsedSpec(
 ) extends AbstractSpec {
 
   test(s"${this.getClass.getName} should parse sbt file") {
-    files foreach { case (content, description, nonEmptyImports, nonEmptyStatements) =>
+    files foreach { (content, description, nonEmptyImports, nonEmptyStatements) =>
       println(s"""${getClass.getSimpleName}: "$description" """)
       val (imports, statements) = splitter(content)
       assert(
diff --git a/buildfile/src/test/scala/sbt/internal/parser/SessionSettingsSpec.scala b/buildfile/src/test/scala/sbt/internal/parser/SessionSettingsSpec.scala
index a6f9c8d6d..b1a0b2953 100644
--- a/buildfile/src/test/scala/sbt/internal/parser/SessionSettingsSpec.scala
+++ b/buildfile/src/test/scala/sbt/internal/parser/SessionSettingsSpec.scala
@@ -48,7 +48,7 @@ abstract class AbstractSessionSettingsSpec(folder: String) extends AbstractSpec
     allFiles.foreach { file =>
       val originalLines = readLines(file)
       val virtualFile = converter.toVirtualFile(file)
-      expectedResultAndMap(file).foreach { case (expectedResultList, commands) =>
+      expectedResultAndMap(file).foreach { (expectedResultList, commands) =>
         val resultList = SbtRefactorings.applySessionSettings(originalLines, commands)
         val expected = SbtParser(virtualFile, expectedResultList)
         val result = SbtParser(virtualFile, resultList)
diff --git a/core-macros/src/main/scala/sbt/internal/util/appmacro/ContextUtil.scala b/core-macros/src/main/scala/sbt/internal/util/appmacro/ContextUtil.scala
index 1c3c77987..99495f45e 100644
--- a/core-macros/src/main/scala/sbt/internal/util/appmacro/ContextUtil.scala
+++ b/core-macros/src/main/scala/sbt/internal/util/appmacro/ContextUtil.scala
@@ -74,7 +74,7 @@ trait ContextUtil[C <: Quotes & scala.Singleton](val valStart: Int):
       override def cacheInputTupleTypeRepr: TypeRepr =
         tupleTypeRepr(inputs.withFilter(_.isCacheInput).map(_.tpe))
       override def cacheInputExpr(tupleTerm: Term): Expr[Tuple] =
-        exprOfTupleFromSeq(inputs.zipWithIndex.flatMap { case (input, idx) =>
+        exprOfTupleFromSeq(inputs.zipWithIndex.flatMap { (input, idx) =>
           if input.tags.nonEmpty then
             input.tpe.asType match
               case '[a] =>
diff --git a/internal/util-complete/src/main/scala/sbt/internal/util/complete/History.scala b/internal/util-complete/src/main/scala/sbt/internal/util/complete/History.scala
index dc664a467..3285cdb67 100644
--- a/internal/util-complete/src/main/scala/sbt/internal/util/complete/History.scala
+++ b/internal/util-complete/src/main/scala/sbt/internal/util/complete/History.scala
@@ -47,7 +47,7 @@ final class History private (val lines: IndexedSeq[String], val path: Option[Fil
     lines.toList
       .drop(scala.math.max(0, lines.size - historySize))
       .zipWithIndex
-      .map { case (line, number) => "   " + number + "  " + line }
+      .map { (line, number) => "   " + number + "  " + line }
       .takeRight(show max 1)
 }
 
diff --git a/internal/util-complete/src/main/scala/sbt/internal/util/complete/HistoryCommands.scala b/internal/util-complete/src/main/scala/sbt/internal/util/complete/HistoryCommands.scala
index 133935e3c..f446eb35e 100644
--- a/internal/util-complete/src/main/scala/sbt/internal/util/complete/HistoryCommands.scala
+++ b/internal/util-complete/src/main/scala/sbt/internal/util/complete/HistoryCommands.scala
@@ -44,7 +44,7 @@ object HistoryCommands {
 
   def helpString =
     "History commands:\n   " + (descriptions
-      .map { case (c, d) => c + "    " + d })
+      .map { (c, d) => c + "    " + d })
       .mkString("\n   ")
 
   def printHelp(): Unit = println(helpString)
@@ -62,11 +62,11 @@ object HistoryCommands {
     { printHistory(h, MaxLines, show); nil[String].some }
   }
 
-  lazy val execStr = flag('?') ~ token(any.+.string, "<string>") map { case (contains, str) =>
+  lazy val execStr = flag('?') ~ token(any.+.string, "<string>") map { (contains, str) =>
     execute(h => if (contains) h !? str else h ! str)
   }
 
-  lazy val execInt = flag('-') ~ num map { case (neg, value) =>
+  lazy val execInt = flag('-') ~ num map { (neg, value) =>
     execute(h => if (neg) h !- value else h ! value)
   }
 
diff --git a/internal/util-complete/src/main/scala/sbt/internal/util/complete/Parsers.scala b/internal/util-complete/src/main/scala/sbt/internal/util/complete/Parsers.scala
index 50b103b29..6341e12a3 100644
--- a/internal/util-complete/src/main/scala/sbt/internal/util/complete/Parsers.scala
+++ b/internal/util-complete/src/main/scala/sbt/internal/util/complete/Parsers.scala
@@ -282,7 +282,7 @@ trait Parsers {
       (open ~ (notDelim ~ close).?).flatMap {
         case (l, Some((content, r))) => Parser.success(s"$l$content$r")
         case (l, None) =>
-          ((notDelim ~ impl()).map { case (leftPrefix, nestedBraces) =>
+          ((notDelim ~ impl()).map { (leftPrefix, nestedBraces) =>
             leftPrefix + nestedBraces
           }.+ ~ notDelim ~ close).map { case ((nested, suffix), r) =>
             s"$l${nested.mkString}$suffix$r"
@@ -314,10 +314,10 @@ trait Parsers {
    * Parses an unquoted, non-empty String value that cannot start with a double quote and cannot
    * contain whitespace.
    */
-  lazy val NotQuoted = (NotDQuoteSpaceClass ~ OptNotSpace) map { case (c, s) => c.toString + s }
+  lazy val NotQuoted = (NotDQuoteSpaceClass ~ OptNotSpace) map { (c, s) => c.toString + s }
 
   /** Parses a non-empty String value that cannot start with a double quote, but includes double quotes. */
-  lazy val NotQuotedThenQuoted = (NotQuoted ~ StringEscapable) map { case (s1, s2) =>
+  lazy val NotQuotedThenQuoted = (NotQuoted ~ StringEscapable) map { (s1, s2) =>
     s"""$s1\"$s2\""""
   }
 
diff --git a/internal/util-complete/src/main/scala/sbt/internal/util/complete/SizeParser.scala b/internal/util-complete/src/main/scala/sbt/internal/util/complete/SizeParser.scala
index 3708edefe..5f066b5ed 100644
--- a/internal/util-complete/src/main/scala/sbt/internal/util/complete/SizeParser.scala
+++ b/internal/util-complete/src/main/scala/sbt/internal/util/complete/SizeParser.scala
@@ -47,7 +47,7 @@ private[sbt] object SizeParser {
     ((numberParser <~ SpaceClass
       .examples(" ", "b", "B", "g", "G", "k", "K", "m", "M")
       .*) ~ unitParser.?)
-      .map { case (number, unit) =>
+      .map { (number, unit) =>
         unit match {
           case None | Some(SizeUnit.Bytes) => multiply(number, right = 1L)
           case Some(SizeUnit.KiloBytes)    => multiply(number, right = 1024L)
diff --git a/internal/util-logging/src/main/scala/sbt/util/LoggerContext.scala b/internal/util-logging/src/main/scala/sbt/util/LoggerContext.scala
index dc426e91a..b21784c31 100644
--- a/internal/util-logging/src/main/scala/sbt/util/LoggerContext.scala
+++ b/internal/util-logging/src/main/scala/sbt/util/LoggerContext.scala
@@ -39,14 +39,14 @@ object LoggerContext {
       private val consoleAppenders: AtomicReference[Vector[(Appender, Level.Value)]] =
         new AtomicReference(Vector.empty)
       def log(level: Level.Value, message: => String): Unit = {
-        val toAppend = consoleAppenders.get.filter { case (a, l) => level.compare(l) >= 0 }
+        val toAppend = consoleAppenders.get.filter { (a, l) => level.compare(l) >= 0 }
         if (toAppend.nonEmpty) {
           val m = message
-          toAppend.foreach { case (a, l) => a.appendLog(level, m) }
+          toAppend.foreach { (a, l) => a.appendLog(level, m) }
         }
       }
       def log[T](level: Level.Value, message: ObjectEvent[T]): Unit = {
-        consoleAppenders.get.foreach { case (a, l) =>
+        consoleAppenders.get.foreach { (a, l) =>
           if (level.compare(l) >= 0) a.appendObjectEvent(level, message)
         }
       }
diff --git a/internal/util-relation/src/main/scala/sbt/internal/util/Relation.scala b/internal/util-relation/src/main/scala/sbt/internal/util/Relation.scala
index 962acb17a..b6e9179e1 100644
--- a/internal/util-relation/src/main/scala/sbt/internal/util/Relation.scala
+++ b/internal/util-relation/src/main/scala/sbt/internal/util/Relation.scala
@@ -32,7 +32,7 @@ object Relation {
     val reverse = reversePairs.foldLeft(Map.empty[B, Set[A]]) { case (m, (b, a)) =>
       add(m, b, a :: Nil)
     }
-    make(forward filter { case (a, bs) => bs.nonEmpty }, reverse)
+    make(forward filter { (a, bs) => bs.nonEmpty }, reverse)
   }
 
   def merge[A, B](rels: Iterable[Relation[A, B]]): Relation[A, B] =
@@ -58,10 +58,10 @@ object Relation {
 
   /** when both parameters taken by relation are the same type, switch calls a function on them. */
   private[sbt] def switch[X, Y](relation: Relation[X, X], f: X => Y): Relation[Y, Y] = {
-    val forward = relation.forwardMap.map { case (first, second) =>
+    val forward = relation.forwardMap.map { (first, second) =>
       f(first) -> second.map(f)
     }
-    val reverse = relation.reverseMap.map { case (first, second) =>
+    val reverse = relation.reverseMap.map { (first, second) =>
       f(first) -> second.map(f)
     }
     make(forward, reverse)
@@ -170,7 +170,7 @@ private final class MRelation[A, B](fwd: Map[A, Set[B]], rev: Map[B, Set[A]])
   def size = (fwd.valuesIterator map (_.size)).sum
 
   def all: Iterable[(A, B)] =
-    fwd.iterator.flatMap { case (a, bs) => bs.iterator.map(b => (a, b)) }.to(Iterable)
+    fwd.iterator.flatMap { (a, bs) => bs.iterator.map(b => (a, b)) }.to(Iterable)
 
   def +(pair: (A, B)) = this + (pair._1, Set(pair._2))
   def +(from: A, to: B) = this + (from, to :: Nil)
@@ -221,5 +221,5 @@ private final class MRelation[A, B](fwd: Map[A, Set[B]], rev: Map[B, Set[A]])
   override def hashCode = fwd.filterNot(_._2.isEmpty).hashCode()
 
   override def toString =
-    all.map { case (a, b) => s"$a -> $b" }.mkString("Relation [", ", ", "]")
+    all.map { (a, b) => s"$a -> $b" }.mkString("Relation [", ", ", "]")
 }
diff --git a/internal/util-relation/src/test/scala/RelationTest.scala b/internal/util-relation/src/test/scala/RelationTest.scala
index f1ec8829e..d280c4c5e 100644
--- a/internal/util-relation/src/test/scala/RelationTest.scala
+++ b/internal/util-relation/src/test/scala/RelationTest.scala
@@ -22,7 +22,7 @@ object RelationTest extends Properties("Relation") {
 
     r._1s == _1s && r.forwardMap.keySet == _1s &&
     r._2s == _2s && r.reverseMap.keySet == _2s &&
-    pairs.forall { case (a, b) =>
+    pairs.forall { (a, b) =>
       (r.forward(a) contains b) &&
       (r.reverse(b) contains a) &&
       (r.forwardMap(a) contains b) &&
@@ -31,7 +31,7 @@ object RelationTest extends Properties("Relation") {
   }
 
   property("Does not contain removed entries") = forAll { (pairs: List[(Int, Double, Boolean)]) =>
-    val add = pairs.map { case (a, b, c) => (a, b) }
+    val add = pairs.map { (a, b, c) => (a, b) }
     val added = Relation.empty[Int, Double] ++ add
 
     val removeFine = pairs.collect { case (a, b, true) => (a, b) }
@@ -46,7 +46,7 @@ object RelationTest extends Properties("Relation") {
       ("Forward map does not contain removed" |: !r.forwardMap.contains(rem)) &&
       ("Removed is not a value in reverse map" |: !r.reverseMap.values.toSet.contains(rem))
     } &&
-    all(removeFine) { case (a, b) =>
+    all(removeFine) { (a, b) =>
       ("Forward does not contain removed" |: (!r.forward(a).contains(b))) &&
       ("Reverse does not contain removed" |: (!r.reverse(b).contains(a))) &&
       ("Forward map does not contain removed" |: (notIn(r.forwardMap, a, b))) &&
@@ -58,7 +58,7 @@ object RelationTest extends Properties("Relation") {
     val splitInto = math.abs(randomInt) % 10 + 1 // Split into 1-10 groups.
     val rel = Relation.empty[Int, Double] ++ entries
     val grouped = rel.groupBy(_._1 % splitInto)
-    all(grouped.toSeq) { case (k, rel_k) =>
+    all(grouped.toSeq) { (k, rel_k) =>
       rel_k._1s forall { _ % splitInto == k }
     }
   }
diff --git a/internal/util-scripted/src/main/scala/sbt/internal/scripted/FileCommands.scala b/internal/util-scripted/src/main/scala/sbt/internal/scripted/FileCommands.scala
index f20a362f4..a75d7bb75 100644
--- a/internal/util-scripted/src/main/scala/sbt/internal/scripted/FileCommands.scala
+++ b/internal/util-scripted/src/main/scala/sbt/internal/scripted/FileCommands.scala
@@ -71,7 +71,7 @@ class FileCommands(baseDirectory: File) extends BasicStatementHandler {
         case Nil      => sys.error("unexpected Nil")
         case g :: Nil => g
         case g :: gs =>
-          gs.foldLeft(g) { case (acc, g) =>
+          gs.foldLeft(g) { (acc, g) =>
             acc || g
           }
       List(combined)
diff --git a/lm-core/src/main/scala/sbt/librarymanagement/DependencyResolution.scala b/lm-core/src/main/scala/sbt/librarymanagement/DependencyResolution.scala
index 3e659056b..05b1fc122 100644
--- a/lm-core/src/main/scala/sbt/librarymanagement/DependencyResolution.scala
+++ b/lm-core/src/main/scala/sbt/librarymanagement/DependencyResolution.scala
@@ -168,7 +168,7 @@ class DependencyResolution private[sbt] (lmEngine: DependencyResolutionInterface
       restrictedCopy(m, true)
     }
     // Adding list of explicit artifacts here.
-    val exls = Map(config.excludes map { case (k, v) => (k, v.toSet) }*)
+    val exls = Map(config.excludes map { (k, v) => (k, v.toSet) }*)
     val deps = baseModules.distinct flatMap classifiedArtifacts(classifiers, exls, artifacts)
     val base = restrictedCopy(id, true).withName(id.name + classifiers.mkString("$", "_", ""))
     val moduleSetting = ModuleDescriptorConfiguration(base, ModuleInfo(base.name))
@@ -187,7 +187,7 @@ class DependencyResolution private[sbt] (lmEngine: DependencyResolutionInterface
           ((config.sourceArtifactTypes.toSeq map (_ -> Artifact.SourceClassifier))
             :: (config.docArtifactTypes.toSeq map (_ -> Artifact.DocClassifier)) :: Nil).flatten.toMap
         Right(r.substitute { (conf, mid, artFileSeq) =>
-          artFileSeq map { case (art, f) =>
+          artFileSeq map { (art, f) =>
             // Deduce the classifier from the type if no classifier is present already
             art.withClassifier(art.classifier orElse typeClassifierMap.get(art.`type`)) -> f
           }
diff --git a/lm-core/src/main/scala/sbt/librarymanagement/EvictionError.scala b/lm-core/src/main/scala/sbt/librarymanagement/EvictionError.scala
index b45140daa..a978629cc 100644
--- a/lm-core/src/main/scala/sbt/librarymanagement/EvictionError.scala
+++ b/lm-core/src/main/scala/sbt/librarymanagement/EvictionError.scala
@@ -158,7 +158,7 @@ final class EvictionError private[sbt] (
     val out: mutable.ListBuffer[String] = mutable.ListBuffer()
     out += "found version conflict(s) in library dependencies; some are suspected to be binary incompatible:"
     out += ""
-    evictions.foreach({ case (a, scheme) =>
+    evictions.foreach({ (a, scheme) =>
       val seen: mutable.Set[ModuleID] = mutable.Set()
       val callers: List[String] = (a.evicteds.toList ::: a.winner.toList) flatMap { r =>
         val rev = r.module.revision
diff --git a/lm-core/src/main/scala/sbt/librarymanagement/ModuleIDExtra.scala b/lm-core/src/main/scala/sbt/librarymanagement/ModuleIDExtra.scala
index d630066d3..5d7520948 100644
--- a/lm-core/src/main/scala/sbt/librarymanagement/ModuleIDExtra.scala
+++ b/lm-core/src/main/scala/sbt/librarymanagement/ModuleIDExtra.scala
@@ -60,7 +60,7 @@ private[librarymanagement] abstract class ModuleIDExtra {
 
   /** String representation of the extra attributes, excluding any information only attributes. */
   def extraString: String =
-    extraDependencyAttributes.map { case (k, v) => k + "=" + v }.mkString("(", ", ", ")")
+    extraDependencyAttributes.map { (k, v) => k + "=" + v }.mkString("(", ", ", ")")
 
   /** Returns the extra attributes except for ones marked as information only (ones that typically would not be used for dependency resolution). */
   def extraDependencyAttributes: Map[String, String] =
diff --git a/lm-core/src/main/scala/sbt/librarymanagement/UnresolvedWarning.scala b/lm-core/src/main/scala/sbt/librarymanagement/UnresolvedWarning.scala
index 1bad15d5e..22a807d1c 100644
--- a/lm-core/src/main/scala/sbt/librarymanagement/UnresolvedWarning.scala
+++ b/lm-core/src/main/scala/sbt/librarymanagement/UnresolvedWarning.scala
@@ -70,7 +70,7 @@ object UnresolvedWarning {
         if (path.nonEmpty) {
           val head = path.head
           buffer += "\t\t" + head._1.toString + sourcePosStr(head._2)
-          path.tail foreach { case (m, pos) =>
+          path.tail foreach { (m, pos) =>
             buffer += "\t\t  +- " + m.toString + sourcePosStr(pos)
           }
         }
diff --git a/lm-core/src/main/scala/sbt/librarymanagement/UpdateReportExtra.scala b/lm-core/src/main/scala/sbt/librarymanagement/UpdateReportExtra.scala
index 43076eba1..900c9af0e 100644
--- a/lm-core/src/main/scala/sbt/librarymanagement/UpdateReportExtra.scala
+++ b/lm-core/src/main/scala/sbt/librarymanagement/UpdateReportExtra.scala
@@ -116,7 +116,7 @@ private[librarymanagement] abstract class ModuleReportExtra {
   }
 
   def retrieve(f: (ModuleID, Artifact, File) => File): ModuleReport =
-    withArtifacts(artifacts.map { case (art, file) => (art, f(module, art, file)) })
+    withArtifacts(artifacts.map { (art, file) => (art, f(module, art, file)) })
 }
 
 private[librarymanagement] abstract class UpdateReportExtra {
diff --git a/lm-coursier/src/main/scala/lmcoursier/CoursierDependencyResolution.scala b/lm-coursier/src/main/scala/lmcoursier/CoursierDependencyResolution.scala
index b4a9f6f7b..80a035586 100644
--- a/lm-coursier/src/main/scala/lmcoursier/CoursierDependencyResolution.scala
+++ b/lm-coursier/src/main/scala/lmcoursier/CoursierDependencyResolution.scala
@@ -220,13 +220,13 @@ class CoursierDependencyResolution(
         // (e.g. sbt-dotty 0.13.0-RC1)
         FromSbt.dependencies(d, sv, sbv, optionalCrossVer = true)
       }
-      .map { case (config, dep) =>
+      .map { (config, dep) =>
         (ToCoursier.configuration(config), ToCoursier.dependency(dep))
       }
 
     val orderedConfigs = Inputs
       .orderedConfigurations(Inputs.configExtendsSeq(module0.configurations))
-      .map { case (config, extends0) =>
+      .map { (config, extends0) =>
         (ToCoursier.configuration(config), extends0.map(ToCoursier.configuration))
       }
 
@@ -241,7 +241,7 @@ class CoursierDependencyResolution(
       .withCredentials(conf.credentials.map(ToCoursier.credentials))
       .withFollowHttpToHttpsRedirections(conf.followHttpToHttpsRedirections.getOrElse(true))
 
-    val excludeDependencies = conf.excludeDependencies.map { case (strOrg, strName) =>
+    val excludeDependencies = conf.excludeDependencies.map { (strOrg, strName) =>
       (coursier.Organization(strOrg), coursier.ModuleName(strName))
     }.toSet
 
@@ -263,7 +263,7 @@ class CoursierDependencyResolution(
         .ResolutionParams()
         .withMaxIterations(conf.maxIterations)
         .withProfiles(conf.mavenProfiles.toSet)
-        .withForceVersion(conf.forceVersions.map { case (k, v) => (ToCoursier.module(k), v) }.toMap)
+        .withForceVersion(conf.forceVersions.map { (k, v) => (ToCoursier.module(k), v) }.toMap)
         .withTypelevel(typelevel)
         .withReconciliation(ToCoursier.reconciliation(conf.reconciliation))
         .withExclusions(excludeDependencies)
@@ -293,7 +293,7 @@ class CoursierDependencyResolution(
       conf.sbtScalaJars
     )
 
-    val configs = Inputs.coursierConfigurationsMap(module0.configurations).map { case (k, l) =>
+    val configs = Inputs.coursierConfigurationsMap(module0.configurations).map { (k, l) =>
       ToCoursier.configuration(k) -> l.map(ToCoursier.configuration)
     }
 
@@ -304,11 +304,11 @@ class CoursierDependencyResolution(
       UpdateParams(
         thisModule = (ToCoursier.module(mod), ver),
         artifacts = artifacts.collect { case (d, p, a, Some(f)) => a -> f }.toMap,
-        fullArtifacts = Some(artifacts.map { case (d, p, a, f) => (d, p, a) -> f }.toMap),
+        fullArtifacts = Some(artifacts.map { (d, p, a, f) => (d, p, a) -> f }.toMap),
         classifiers = classifiers,
         configs = configs,
         dependencies = dependencies,
-        forceVersions = conf.forceVersions.map { case (m, v) => (ToCoursier.module(m), v) }.toMap,
+        forceVersions = conf.forceVersions.map { (m, v) => (ToCoursier.module(m), v) }.toMap,
         interProjectDependencies = interProjectDependencies,
         res = resolutions,
         includeSignatures = false,
diff --git a/lm-coursier/src/main/scala/lmcoursier/FromSbt.scala b/lm-coursier/src/main/scala/lmcoursier/FromSbt.scala
index 12266882a..0f3ead3e4 100644
--- a/lm-coursier/src/main/scala/lmcoursier/FromSbt.scala
+++ b/lm-coursier/src/main/scala/lmcoursier/FromSbt.scala
@@ -63,7 +63,7 @@ object FromSbt {
 
   private def attributes(attr: Map[String, String]): Map[String, String] =
     attr
-      .map { case (k, v) =>
+      .map { (k, v) =>
         k.stripPrefix("e:") -> v
       }
       .filter { case (k, _) =>
@@ -131,7 +131,7 @@ object FromSbt {
     )
 
     val mapping = module.configurations.getOrElse("compile")
-    val allMappings = ivyXmlMappings(mapping).map { case (from, to) =>
+    val allMappings = ivyXmlMappings(mapping).map { (from, to) =>
       (Configuration(from.value), Configuration(to.value))
     }
 
@@ -191,7 +191,7 @@ object FromSbt {
     val properties = projectID.extraAttributes.view
       .filterKeys(_.startsWith(prefix))
       .toSeq
-      .map { case (k, v) => (k.stripPrefix("e:"), v) }
+      .map { (k, v) => (k.stripPrefix("e:"), v) }
       .sortBy(_._1)
 
     Project(
diff --git a/lm-coursier/src/main/scala/lmcoursier/Inputs.scala b/lm-coursier/src/main/scala/lmcoursier/Inputs.scala
index 433cfb68f..24bb804d1 100644
--- a/lm-coursier/src/main/scala/lmcoursier/Inputs.scala
+++ b/lm-coursier/src/main/scala/lmcoursier/Inputs.scala
@@ -10,7 +10,7 @@ import scala.collection.mutable
 object Inputs {
 
   def ivyXmlMappings(mapping: String): Seq[(Configuration, Configuration)] =
-    initialIvyXmlMappings(mapping).map { case (from, to) =>
+    initialIvyXmlMappings(mapping).map { (from, to) =>
       Configuration(from.value) -> Configuration(to.value)
     }
 
@@ -96,7 +96,7 @@ object Inputs {
     }
 
     val sets =
-      new mutable.HashMap[Configuration, Wrapper] ++= configurations.map { case (k, l) =>
+      new mutable.HashMap[Configuration, Wrapper] ++= configurations.map { (k, l) =>
         val s = new mutable.HashSet[Configuration]
         s ++= l
         s += k
diff --git a/lm-coursier/src/main/scala/lmcoursier/IvyXml.scala b/lm-coursier/src/main/scala/lmcoursier/IvyXml.scala
index 2984a8f31..49c2ef536 100644
--- a/lm-coursier/src/main/scala/lmcoursier/IvyXml.scala
+++ b/lm-coursier/src/main/scala/lmcoursier/IvyXml.scala
@@ -43,7 +43,7 @@ object IvyXml {
       new PrefixedAttribute("e", k, v, acc)
     }
 
-    val licenseElems = project.info.licenses.map { case (name, urlOpt) =>
+    val licenseElems = project.info.licenses.map { (name, urlOpt) =>
       val n = <license name={name} />
 
       urlOpt.fold(n) { url =>
@@ -62,7 +62,7 @@ object IvyXml {
       </info>
     } % infoAttrs
 
-    val confElems = project.configurations.toVector.collect { case (name, extends0) =>
+    val confElems = project.configurations.toVector.collect { (name, extends0) =>
       val n = <conf name={name.value} visibility="public" description="" />
       if (extends0.nonEmpty)
         n % <x extends={extends0.map(_.value).mkString(",")} />.attributes
@@ -73,7 +73,7 @@ object IvyXml {
     val publications = project.publications
       .groupMap((_, p) => p)((cfg, _) => cfg)
 
-    val publicationElems = publications.map { case (pub, configs) =>
+    val publicationElems = publications.map { (pub, configs) =>
       val n = <artifact name={pub.name} type={pub.`type`.value} ext={pub.ext.value} conf={
         configs.map(_.value).mkString(",")
       } />
@@ -84,8 +84,8 @@ object IvyXml {
         n
     }
 
-    val dependencyElems = project.dependencies.toVector.map { case (conf, dep) =>
-      val excludes = dep.exclusions.toSeq.map { case (org, name) =>
+    val dependencyElems = project.dependencies.toVector.map { (conf, dep) =>
+      val excludes = dep.exclusions.toSeq.map { (org, name) =>
         <exclude org={org.value} module={
           name.value
         } name="*" type="*" ext="*" conf="" matcher="exact"/>
@@ -105,11 +105,11 @@ object IvyXml {
       n % moduleAttrs
     }
 
-    val excludeElems = exclusions.toVector.map { case (org, name) =>
+    val excludeElems = exclusions.toVector.map { (org, name) =>
       <exclude org={org} module={name} artifact="*" type="*" ext="*" matcher="exact"/>
     }
 
-    val overrideElems = overrides.toVector.map { case (org, name, ver) =>
+    val overrideElems = overrides.toVector.map { (org, name, ver) =>
       <override org={org} module={name} rev={ver} matcher="exact"/>
     }
 
diff --git a/lm-coursier/src/main/scala/lmcoursier/definitions/ToCoursier.scala b/lm-coursier/src/main/scala/lmcoursier/definitions/ToCoursier.scala
index baeb0baae..70b8b8365 100644
--- a/lm-coursier/src/main/scala/lmcoursier/definitions/ToCoursier.scala
+++ b/lm-coursier/src/main/scala/lmcoursier/definitions/ToCoursier.scala
@@ -63,7 +63,7 @@ object ToCoursier {
   def reconciliation(
       rs: Vector[(ModuleMatchers, Reconciliation)]
   ): Vector[(coursier.util.ModuleMatchers, coursier.core.Reconciliation)] =
-    rs map { case (m, r) => (moduleMatchers(m), reconciliation(r)) }
+    rs map { (m, r) => (moduleMatchers(m), reconciliation(r)) }
 
   def sameVersions(
       sv: Seq[Set[InclExclRule]]
@@ -79,7 +79,7 @@ object ToCoursier {
       module(dependency.module),
       dependency.version,
       configuration(dependency.configuration),
-      dependency.exclusions.map { case (org, name) =>
+      dependency.exclusions.map { (org, name) =>
         (coursier.core.Organization(org.value), coursier.core.ModuleName(name.value))
       },
       publication(dependency.publication),
@@ -91,10 +91,10 @@ object ToCoursier {
     coursier.core.Project(
       module(project.module),
       project.version,
-      project.dependencies.map { case (conf, dep) =>
+      project.dependencies.map { (conf, dep) =>
         configuration(conf) -> dependency(dep)
       },
-      project.configurations.map { case (k, l) =>
+      project.configurations.map { (k, l) =>
         configuration(k) -> l.map(configuration)
       },
       None,
@@ -106,7 +106,7 @@ object ToCoursier {
       project.packagingOpt.map(t => coursier.core.Type(t.value)),
       relocated = false,
       None,
-      project.publications.map { case (conf, pub) =>
+      project.publications.map { (conf, pub) =>
         configuration(conf) -> publication(pub)
       },
       coursier.core.Info(
@@ -192,12 +192,12 @@ object ToCoursier {
   def strict(strict: Strict): coursier.params.rule.Strict =
     coursier.params.rule
       .Strict()
-      .withInclude(strict.include.map { case (o, n) =>
+      .withInclude(strict.include.map { (o, n) =>
         coursier.util.ModuleMatcher(
           coursier.Module(coursier.Organization(o), coursier.ModuleName(n))
         )
       })
-      .withExclude(strict.exclude.map { case (o, n) =>
+      .withExclude(strict.exclude.map { (o, n) =>
         coursier.util.ModuleMatcher(
           coursier.Module(coursier.Organization(o), coursier.ModuleName(n))
         )
diff --git a/lm-coursier/src/main/scala/lmcoursier/internal/ArtifactsRun.scala b/lm-coursier/src/main/scala/lmcoursier/internal/ArtifactsRun.scala
index b304dbbc1..291dbddae 100644
--- a/lm-coursier/src/main/scala/lmcoursier/internal/ArtifactsRun.scala
+++ b/lm-coursier/src/main/scala/lmcoursier/internal/ArtifactsRun.scala
@@ -65,7 +65,7 @@ object ArtifactsRun {
       }
       .addTransformArtifacts { artifacts =>
         if (params.missingOk)
-          artifacts.map { case (dependency, publication, artifact) =>
+          artifacts.map { (dependency, publication, artifact) =>
             (dependency, publication, artifact.withOptional(true))
           }
         else
diff --git a/lm-coursier/src/main/scala/lmcoursier/internal/ResolutionRun.scala b/lm-coursier/src/main/scala/lmcoursier/internal/ResolutionRun.scala
index 0e90ff268..8cd85fab5 100644
--- a/lm-coursier/src/main/scala/lmcoursier/internal/ResolutionRun.scala
+++ b/lm-coursier/src/main/scala/lmcoursier/internal/ResolutionRun.scala
@@ -46,7 +46,7 @@ object ResolutionRun {
 
     def depsRepr(deps: Seq[(Configuration, Dependency)]) =
       deps
-        .map { case (config, dep) =>
+        .map { (config, dep) =>
           s"${dep.module}:${dep.version}:${config.value}->${dep.configuration.value}"
         }
         .sorted
diff --git a/lm-coursier/src/main/scala/lmcoursier/internal/SbtUpdateReport.scala b/lm-coursier/src/main/scala/lmcoursier/internal/SbtUpdateReport.scala
index cc95a56ab..e7fdf9c86 100644
--- a/lm-coursier/src/main/scala/lmcoursier/internal/SbtUpdateReport.scala
+++ b/lm-coursier/src/main/scala/lmcoursier/internal/SbtUpdateReport.scala
@@ -34,7 +34,7 @@ private[internal] object SbtUpdateReport {
     project.properties.filter(_._1.startsWith("info."))
 
   private val moduleId = caching[(Dependency, String, Map[String, String]), ModuleID] {
-    case (dependency, version, extraProperties) =>
+    (dependency, version, extraProperties) =>
       val mod = sbt.librarymanagement.ModuleID(
         dependency.module.organization.value,
         dependency.module.name.value,
@@ -48,7 +48,7 @@ private[internal] object SbtUpdateReport {
         .withExtraAttributes(dependency.module.attributes ++ extraProperties)
         .withExclusions(
           dependency.minimizedExclusions.toVector
-            .map { case (org, name) =>
+            .map { (org, name) =>
               sbt.librarymanagement
                 .InclExclRule()
                 .withOrganization(org.value)
@@ -61,7 +61,7 @@ private[internal] object SbtUpdateReport {
   private val artifact = caching[
     (Module, Map[String, String], Publication, Artifact, Seq[ClassLoader]),
     sbt.librarymanagement.Artifact
-  ] { case (module, extraProperties, pub, artifact, classLoaders) =>
+  ] { (module, extraProperties, pub, artifact, classLoaders) =>
     sbt.librarymanagement
       .Artifact(pub.name)
       .withType(pub.`type`.value)
@@ -85,7 +85,7 @@ private[internal] object SbtUpdateReport {
         Seq[ClassLoader]
     ),
     ModuleReport
-  ] { case (dependency, dependees, project, artifacts, classLoaders) =>
+  ] { (dependency, dependees, project, artifacts, classLoaders) =>
     val sbtArtifacts = artifacts.collect { case (pub, artifact0, Some(file)) =>
       (
         artifact((dependency.module, infoProperties(project).toMap, pub, artifact0, classLoaders)),
@@ -100,7 +100,7 @@ private[internal] object SbtUpdateReport {
       new GregorianCalendar(dt.year, dt.month, dt.day, dt.hour, dt.minute, dt.second)
     }
 
-    val callers = dependees.distinct.map { case (dependee, dependeeProj) =>
+    val callers = dependees.distinct.map { (dependee, dependeeProj) =>
       Caller(
         moduleId((dependee, dependeeProj.version, Map.empty)),
         // FIXME Shouldn't we only keep the configurations pulling dependency?
@@ -162,14 +162,14 @@ private[internal] object SbtUpdateReport {
 
     val depArtifacts1 = fullArtifactsOpt match {
       case Some(map) =>
-        deps.map { case (d, p, a) =>
+        deps.map { (d, p, a) =>
           val d0 = d.withAttributes(d.attributes.withClassifier(p.classifier))
           val a0 = if (missingOk) a.withOptional(true) else a
           val f = map.get((d0, p, a0)).flatten
           (d, p, a0, f) // not d0
         }
       case None =>
-        deps.map { case (d, p, a) =>
+        deps.map { (d, p, a) =>
           (d, p, a, None)
         }
     }
@@ -184,7 +184,7 @@ private[internal] object SbtUpdateReport {
         val notFound = depArtifacts0.filter(!_._3.extra.contains("sig"))
 
         if (notFound.isEmpty)
-          depArtifacts0.flatMap { case (dep, pub, a, f) =>
+          depArtifacts0.flatMap { (dep, pub, a, f) =>
             val sigPub = pub
               // not too sure about those
               .withExt(Extension(pub.ext.value))
@@ -259,14 +259,14 @@ private[internal] object SbtUpdateReport {
 
     val reverseDependencies = {
       val transitiveReverseDependencies = res.reverseDependencies.toVector
-        .map { case (k, v) => clean(k) -> v.map(clean) }
+        .map { (k, v) => clean(k) -> v.map(clean) }
         .groupMapReduce(_._1)((_, deps) => deps)(_ ++ _)
 
       (transitiveReverseDependencies.toVector ++ directReverseDependencies.toVector)
         .groupMapReduce(_._1)((_, deps) => deps)(_ ++ _)
     }
 
-    groupedDepArtifacts.toVector.map { case (dep, artifacts) =>
+    groupedDepArtifacts.toVector.map { (dep, artifacts) =>
       val proj = lookupProject(dep.moduleVersion).get
       val assembledProject = assemble(proj)
 
@@ -292,7 +292,7 @@ private[internal] object SbtUpdateReport {
               Vector.empty
           }
         }
-      val filesOpt = artifacts.map { case (pub, a, fileOpt) =>
+      val filesOpt = artifacts.map { (pub, a, fileOpt) =>
         val fileOpt0 = fileOpt.orElse {
           if (fullArtifactsOpt.isEmpty)
             artifactFileOpt(proj.module, proj.version, pub.attributes, a)
@@ -328,7 +328,7 @@ private[internal] object SbtUpdateReport {
       classLoaders: Seq[ClassLoader],
   ): UpdateReport = {
 
-    val configReports = resolutions.map { case (config, subRes) =>
+    val configReports = resolutions.map { (config, subRes) =>
       val reports = moduleReports(
         thisModule,
         subRes,
diff --git a/lm-coursier/src/main/scala/lmcoursier/internal/TemporaryInMemoryRepository.scala b/lm-coursier/src/main/scala/lmcoursier/internal/TemporaryInMemoryRepository.scala
index 3a1efb10e..e797a4d68 100644
--- a/lm-coursier/src/main/scala/lmcoursier/internal/TemporaryInMemoryRepository.scala
+++ b/lm-coursier/src/main/scala/lmcoursier/internal/TemporaryInMemoryRepository.scala
@@ -191,7 +191,7 @@ final class TemporaryInMemoryRepository private (
     fallbacks
       .get(dependency.moduleVersion)
       .toSeq
-      .map { case (url, changing) =>
+      .map { (url, changing) =>
         val url0 = url.toString
         val ext = url0.substring(url0.lastIndexOf('.') + 1)
         val pub = Publication(
diff --git a/lm-coursier/src/main/scala/lmcoursier/internal/UpdateRun.scala b/lm-coursier/src/main/scala/lmcoursier/internal/UpdateRun.scala
index 024d2ec83..b79f3cec6 100644
--- a/lm-coursier/src/main/scala/lmcoursier/internal/UpdateRun.scala
+++ b/lm-coursier/src/main/scala/lmcoursier/internal/UpdateRun.scala
@@ -17,11 +17,11 @@ object UpdateRun {
       configs: Map[Configuration, Set[Configuration]]
   ): Map[Configuration, Set[Dependency]] = {
 
-    val allDepsByConfig = depsByConfig.map { case (config, deps) =>
+    val allDepsByConfig = depsByConfig.map { (config, deps) =>
       config -> res(config).subset(deps).minDependencies
     }
 
-    val filteredAllDepsByConfig = allDepsByConfig.map { case (config, allDeps) =>
+    val filteredAllDepsByConfig = allDepsByConfig.map { (config, allDeps) =>
       val allExtendedConfigs = configs.getOrElse(config, Set.empty) - config
       val inherited = allExtendedConfigs
         .flatMap(allDepsByConfig.getOrElse(_, Set.empty))
@@ -39,11 +39,11 @@ object UpdateRun {
       configs: Map[Configuration, Set[Configuration]]
   ): Set[Dependency] =
     allDependenciesByConfig(res, depsByConfig, configs)
-      .flatMap { case (config, deps) =>
+      .flatMap { (config, deps) =>
         deps.map(dep => dep.withConfiguration(config --> dep.configuration))
       }
       .groupBy(_.withConfiguration(Configuration.empty))
-      .map { case (dep, l) =>
+      .map { (dep, l) =>
         dep.withConfiguration(Configuration.join(l.map(_.configuration).toSeq*))
       }
       .toSet
diff --git a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ConvertResolver.scala b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ConvertResolver.scala
index 0adba627b..e44a6aa42 100644
--- a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ConvertResolver.scala
+++ b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ConvertResolver.scala
@@ -147,7 +147,7 @@ private[sbt] object ConvertResolver {
     (updateOptions.resolverConverter orElse defaultConvert)((r, settings, log))
 
   /** The default implementation of converter. */
-  lazy val defaultConvert: ResolverConverter = { case (r, settings, log) =>
+  lazy val defaultConvert: ResolverConverter = { (r, settings, log) =>
     val managedChecksums = Option(settings.getVariable(ManagedChecksums)) match {
       case Some(x) => x.toBoolean
       case _       => false
diff --git a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/CustomPomParser.scala b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/CustomPomParser.scala
index 6e29b9e9c..b610282f0 100644
--- a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/CustomPomParser.scala
+++ b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/CustomPomParser.scala
@@ -179,7 +179,7 @@ object CustomPomParser {
       .toMap
   }
   private[sbt] def toUnqualify(propertyAttributes: Map[String, String]): Map[String, String] =
-    (propertyAttributes - ExtraAttributesKey) map { case (k, v) => ("e:" + k, v) }
+    (propertyAttributes - ExtraAttributesKey) map { (k, v) => ("e:" + k, v) }
 
   private def shouldBeUnqualified(m: Map[String, String]): Map[String, String] =
     m.view.filterKeys(unqualifiedKeys).toMap
diff --git a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala
index ed1e11999..1602dc659 100644
--- a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala
+++ b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala
@@ -808,7 +808,7 @@ private[sbt] object IvySbt {
   }
   private[sbt] def javaMap(m: Map[String, String], unqualify: Boolean = false) = {
     import scala.jdk.CollectionConverters.*
-    val map = if (unqualify) m map { case (k, v) => (k.stripPrefix("e:"), v) }
+    val map = if (unqualify) m map { (k, v) => (k.stripPrefix("e:"), v) }
     else m
     if (map.isEmpty) null else map.asJava
   }
diff --git a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala
index c8e08f722..552e895c1 100644
--- a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala
+++ b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala
@@ -170,7 +170,7 @@ object IvyActions {
     val rawa = artifacts.keys.toVector
     val seqa = CrossVersion.substituteCross(rawa, cross)
     val zipped = rawa zip IvySbt.mapArtifacts(module, seqa)
-    zipped map { case (a, ivyA) => (ivyA, artifacts(a)) }
+    zipped map { (a, ivyA) => (ivyA, artifacts(a)) }
   }
 
   /**
@@ -255,7 +255,7 @@ object IvyActions {
       art.classifier.map { c =>
         (restrictedCopy(mod, false), c)
       }
-    } groupBy (_._1) map { case (mod, pairs) => (mod, pairs.map(_._2).toSet) }
+    } groupBy (_._1) map { (mod, pairs) => (mod, pairs.map(_._2).toSet) }
 
   /**
    * Represents the inputs to pass in to [[resolveAndRetrieve]] and [[cachedResolveAndRetrieve]].
@@ -497,7 +497,7 @@ object IvyActions {
       checkFilesPresent(artifacts)
       try {
         resolver.beginPublishTransaction(module.getModuleRevisionId(), overwrite);
-        artifacts.foreach { case (artifact, file) =>
+        artifacts.foreach { (artifact, file) =>
           IvyUtil.retryWithBackoff(
             resolver.publish(artifact, file, overwrite),
             TransientNetworkException.apply,
diff --git a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala
index 08307fff5..6c537a26e 100644
--- a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala
+++ b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala
@@ -420,7 +420,7 @@ private[sbt] trait CachedResolutionResolveEngine extends ResolveEngine {
       val (internal, external) = mds.partition { case (_, _, dd) =>
         cache.internalDependency(dd, projectResolver).isDefined
       }
-      val internalResults = internal map { case (md, changing, dd) =>
+      val internalResults = internal map { (md, changing, dd) =>
         cache.getOrElseUpdateMiniGraph(
           md,
           changing,
@@ -432,7 +432,7 @@ private[sbt] trait CachedResolutionResolveEngine extends ResolveEngine {
           doWork(md, dd)
         }
       }
-      val externalResults = external map { case (md0, changing, dd) =>
+      val externalResults = external map { (md0, changing, dd) =>
         val configurationsInInternal = internalResults flatMap {
           case Right(ur) =>
             ur.allModules.flatMap { case md =>
@@ -498,7 +498,7 @@ private[sbt] trait CachedResolutionResolveEngine extends ResolveEngine {
     val messages = errors flatMap { _.messages }
     val failed = errors flatMap { _.failed }
     val failedPaths = errors flatMap {
-      _.failedPaths.toList map { case (failed, paths) =>
+      _.failedPaths.toList map { (failed, paths) =>
         if (paths.isEmpty) (failed, paths)
         else
           (
@@ -584,7 +584,7 @@ private[sbt] trait CachedResolutionResolveEngine extends ResolveEngine {
     // this might take up some memory, but it's limited to a single
     val reports1 = reports0 flatMap { filterReports }
     val allModules0: Map[(String, String), Vector[OrganizationArtifactReport]] =
-      Map(orgNamePairs map { case (organization, name) =>
+      Map(orgNamePairs map { (organization, name) =>
         val xs = reports1 filter { oar =>
           oar.organization == organization && oar.name == name
         }
@@ -613,7 +613,7 @@ private[sbt] trait CachedResolutionResolveEngine extends ResolveEngine {
             if (!loopSets(loop.toSet)) {
               loopSets += loop.toSet
               loopLists += loop
-              val loopStr = (loop map { case (o, n) => s"$o:$n" }).mkString("->")
+              val loopStr = (loop map { (o, n) => s"$o:$n" }).mkString("->")
               log.warn(s"""avoid circular dependency while using cached resolution: $loopStr""")
             }
           } else testLoop(m, c, c :: history)
@@ -745,7 +745,7 @@ private[sbt] trait CachedResolutionResolveEngine extends ResolveEngine {
       }
     val guard0 = (orgNamePairs.size * orgNamePairs.size) + 1
     val sorted: Vector[(String, String)] = sortModules(orgNamePairs, Vector(), Vector(), 0, guard0)
-    val sortedStr = (sorted map { case (o, n) => s"$o:$n" }).mkString(", ")
+    val sortedStr = (sorted map { (o, n) => s"$o:$n" }).mkString(", ")
     log.debug(s":: sort result: $sortedStr")
     val result = resolveConflicts(sorted.toList, allModules0)
     result.toVector
diff --git a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/SbtChainResolver.scala b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/SbtChainResolver.scala
index 676abb830..a6390728c 100644
--- a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/SbtChainResolver.scala
+++ b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/SbtChainResolver.scala
@@ -191,7 +191,7 @@ private[sbt] case class SbtChainResolver(
         data: ResolveData
     ): Option[ResolvedModuleRevision] = {
 
-      val sortedRevisions = foundRevisions.sortBy { case (rmr, resolver) =>
+      val sortedRevisions = foundRevisions.sortBy { (rmr, resolver) =>
         val publicationDate = rmr.getPublicationDate
         val descriptorDate = rmr.getDescriptor.getPublicationDate
         Message.warn(s"Sorting results from $rmr, using $publicationDate and $descriptorDate.")
@@ -278,7 +278,7 @@ private[sbt] case class SbtChainResolver(
     }
 
     /** Cleans unnecessary module id information not provided by [[IvyRetrieve.toModuleID()]]. */
-    private final val moduleResolvers = updateOptions.moduleResolvers.map { case (key, value) =>
+    private final val moduleResolvers = updateOptions.moduleResolvers.map { (key, value) =>
       val cleanKey = ModuleID(key.organization, key.name, key.revision)
         .withExtraAttributes(key.extraAttributes)
         .withBranchName(key.branchName)
diff --git a/lm-ivy/src/main/scala/sbt/librarymanagement/ivy/Credentials.scala b/lm-ivy/src/main/scala/sbt/librarymanagement/ivy/Credentials.scala
index 694e48dbc..486b29e6a 100644
--- a/lm-ivy/src/main/scala/sbt/librarymanagement/ivy/Credentials.scala
+++ b/lm-ivy/src/main/scala/sbt/librarymanagement/ivy/Credentials.scala
@@ -71,7 +71,7 @@ object Credentials {
   private def read(from: File): Map[String, String] = {
     val properties = new java.util.Properties
     IO.load(properties, from)
-    properties.asScala.map { case (k, v) => (k.toString, v.toString.trim) }.toMap
+    properties.asScala.map { (k, v) => (k.toString, v.toString.trim) }.toMap
   }
 }
 
diff --git a/main-actions/src/main/scala/sbt/Mapper.scala b/main-actions/src/main/scala/sbt/Mapper.scala
index a59918a77..8d2d6b861 100644
--- a/main-actions/src/main/scala/sbt/Mapper.scala
+++ b/main-actions/src/main/scala/sbt/Mapper.scala
@@ -51,7 +51,7 @@ object Mapper:
     Option(baseDirectory.getParentFile)
       .map(parent => PathFinder(baseDirectory).allPaths pair relativeTo(parent))
       .getOrElse(PathFinder(baseDirectory).allPaths pair basic)
-      .map { case (f, s) => conv.toVirtualFile(f.toPath) -> s }
+      .map { (f, s) => conv.toVirtualFile(f.toPath) -> s }
 
   /**
    * return a Seq of mappings  excluding the directory itself.
@@ -82,5 +82,5 @@ object Mapper:
   def contentOf(baseDirectory: File)(using conv: FileConverter): Seq[(VirtualFile, String)] =
     (PathFinder(baseDirectory).allPaths --- PathFinder(baseDirectory))
       .pair(relativeTo(baseDirectory))
-      .map { case (f, s) => conv.toVirtualFile(f.toPath) -> s }
+      .map { (f, s) => conv.toVirtualFile(f.toPath) -> s }
 end Mapper
diff --git a/main-actions/src/main/scala/sbt/Pkg.scala b/main-actions/src/main/scala/sbt/Pkg.scala
index 74b2b17fa..fad3e2c19 100644
--- a/main-actions/src/main/scala/sbt/Pkg.scala
+++ b/main-actions/src/main/scala/sbt/Pkg.scala
@@ -106,7 +106,7 @@ object Pkg:
     import sbt.util.CacheImplicits.hashedVirtualFileRefToStr
     private def sourcesStr: String =
       sources
-        .map { case (k, v) =>
+        .map { (k, v) =>
           s"${hashedVirtualFileRefToStr(k)}=$v"
         }
         .mkString(",\n    ")
@@ -153,7 +153,7 @@ object Pkg:
   ): VirtualFile =
     val manifest = toManifest(conf, log)
     val out = converter.toPath(conf.jar).toFile()
-    val sources = conf.sources.map { case (vf, path) =>
+    val sources = conf.sources.map { (vf, path) =>
       converter.toPath(vf).toFile() -> path
     }
     makeJar(sources, out, manifest, log, time)
@@ -235,7 +235,7 @@ object Pkg:
     log.debug("Done packaging.")
   }
   def sourcesDebugString(sources: Seq[(File, String)]): String =
-    "Input file mappings:\n\t" + (sources map { case (f, s) => s + "\n\t  " + f } mkString ("\n\t"))
+    "Input file mappings:\n\t" + (sources map { (f, s) => s + "\n\t  " + f } mkString ("\n\t"))
 
   given manifestFormat: JsonFormat[Manifest] = projectFormat[Manifest, Array[Byte]](
     m => {
@@ -303,7 +303,7 @@ object PackageOption:
             unbuilder.beginObject(js)
             val attributes = unbuilder.readField[Vector[(String, String)]]("attributes")
             unbuilder.endObject()
-            PackageOption.ManifestAttributes(attributes.map { case (k, v) =>
+            PackageOption.ManifestAttributes(attributes.map { (k, v) =>
               Attributes.Name(k) -> v
             }*)
           case None => deserializationError("Expected JsObject but found None")
@@ -311,7 +311,7 @@ object PackageOption:
         builder.beginObject()
         builder.addField(
           "attributes",
-          obj.attributes.toVector.map { case (k, v) => k.toString -> v }
+          obj.attributes.toVector.map { (k, v) => k.toString -> v }
         )
         builder.endObject()
 
diff --git a/main-actions/src/main/scala/sbt/Sync.scala b/main-actions/src/main/scala/sbt/Sync.scala
index bf369a2f2..7ea32d08b 100644
--- a/main-actions/src/main/scala/sbt/Sync.scala
+++ b/main-actions/src/main/scala/sbt/Sync.scala
@@ -105,7 +105,7 @@ object Sync {
   def noDuplicateTargets(relation: Relation[File, File]): Unit = {
     val dups = relation.reverseMap
       .withFilter { case (_, srcs) => srcs.size >= 2 && srcs.exists(!_.isDirectory) }
-      .map { case (target, srcs) => "\n\t" + target + "\nfrom\n\t" + srcs.mkString("\n\t\t") }
+      .map { (target, srcs) => "\n\t" + target + "\nfrom\n\t" + srcs.mkString("\n\t\t") }
     if (dups.nonEmpty)
       sys.error("Duplicate mappings:" + dups.mkString)
   }
@@ -159,7 +159,7 @@ object Sync {
   )(using infoFormat: JsonFormat[F]): Unit = {
     val virtualRelation: Relation[VirtualFileRef, VirtualFileRef] =
       Relation.switch(relation, (f: File) => fileConverter.toVirtualFile(f.toPath))
-    val virtualInfo: Map[VirtualFileRef, F] = info.map { case (file, fileInfo) =>
+    val virtualInfo: Map[VirtualFileRef, F] = info.map { (file, fileInfo) =>
       fileConverter.toVirtualFile(file.toPath) -> fileInfo
     }
 
@@ -188,7 +188,7 @@ object Sync {
       fileConverter: FileConverter
   ): RelationInfo[F] = {
     val firstPart = Relation.switch(info._1, (r: VirtualFileRef) => fileConverter.toPath(r).toFile)
-    val secondPart = info._2.map { case (file, fileInfo) =>
+    val secondPart = info._2.map { (file, fileInfo) =>
       fileConverter.toPath(file).toFile -> fileInfo
     }
     firstPart -> secondPart
diff --git a/main-actions/src/main/scala/sbt/TestResultLogger.scala b/main-actions/src/main/scala/sbt/TestResultLogger.scala
index 687dd3a52..6d523ea75 100644
--- a/main-actions/src/main/scala/sbt/TestResultLogger.scala
+++ b/main-actions/src/main/scala/sbt/TestResultLogger.scala
@@ -161,7 +161,7 @@ object TestResultLogger {
         "Canceled" -> canceledCount,
         "Pending" -> pendingCount
       )
-      val extra = otherCounts.withFilter(_._2 > 0).map { case (label, count) => s", $label $count" }
+      val extra = otherCounts.withFilter(_._2 > 0).map { (label, count) => s", $label $count" }
 
       val postfix = base + extra.mkString
       results.overall match {
diff --git a/main-actions/src/main/scala/sbt/Tests.scala b/main-actions/src/main/scala/sbt/Tests.scala
index 7601dc6ed..69b5533d3 100644
--- a/main-actions/src/main/scala/sbt/Tests.scala
+++ b/main-actions/src/main/scala/sbt/Tests.scala
@@ -416,7 +416,7 @@ object Tests {
       testFun: TestFunction,
       nestedTasks: Seq[TestTask]
   ): Seq[(String, TestFunction)] =
-    (nestedTasks.view.zipWithIndex map { case (nt, idx) =>
+    (nestedTasks.view.zipWithIndex map { (nt, idx) =>
       val testFunDef = testFun.taskDef
       (
         testFunDef.fullyQualifiedName,
@@ -447,8 +447,8 @@ object Tests {
       runnables: Seq[TestRunnable],
       tags: Seq[(Tag, Int)]
   ): Task[Map[String, SuiteResult]] = {
-    val tasks = runnables.map { case (name, test) => toTask(loader, name, test, tags) }
-    tasks.join.map(_.foldLeft(Map.empty[String, SuiteResult]) { case (sum, e) =>
+    val tasks = runnables.map { (name, test) => toTask(loader, name, test, tags) }
+    tasks.join.map(_.foldLeft(Map.empty[String, SuiteResult]) { (sum, e) =>
       val merged = sum.toSeq ++ e.toSeq
       val grouped = merged.groupBy(_._1)
       grouped.view
diff --git a/main-actions/src/test/scala/sbt/MapperTest.scala b/main-actions/src/test/scala/sbt/MapperTest.scala
index 0c94f4129..6464f64bd 100644
--- a/main-actions/src/test/scala/sbt/MapperTest.scala
+++ b/main-actions/src/test/scala/sbt/MapperTest.scala
@@ -31,7 +31,7 @@ object MapperTest extends verify.BasicTestSuite:
 
       val mappings = Mapper
         .directory(tempDirectory)
-        .map { case (h, p) =>
+        .map { (h, p) =>
           (h.toString, p)
         }
 
@@ -51,7 +51,7 @@ object MapperTest extends verify.BasicTestSuite:
       given FileConverter = MappedFileConverter(Map("BASE" -> tempDirectory.toPath()), true)
       val mappings = Mapper
         .directory(tempDirectory)
-        .map { case (h, p) =>
+        .map { (h, p) =>
           (h.toString, p)
         }
       Predef.assert(
@@ -77,7 +77,7 @@ object MapperTest extends verify.BasicTestSuite:
       given FileConverter = conv0
       val file = tempDirectory / "file"
       IO.touch(file)
-      val mappings = Mapper.directory(file).map { case (h, p) =>
+      val mappings = Mapper.directory(file).map { (h, p) =>
         (h.toString, p)
       }
       Predef.assert(
@@ -99,7 +99,7 @@ object MapperTest extends verify.BasicTestSuite:
       IO.createDirectory(nestedDir)
       IO.touch(nestedDirFile)
 
-      val mappings = Mapper.contentOf(tempDirectory).map { case (h, p) =>
+      val mappings = Mapper.contentOf(tempDirectory).map { (h, p) =>
         (h.toString, p)
       }
       Predef.assert(
diff --git a/main-command/src/main/scala/sbt/BasicCommands.scala b/main-command/src/main/scala/sbt/BasicCommands.scala
index 1811da0bd..ccef59e7f 100644
--- a/main-command/src/main/scala/sbt/BasicCommands.scala
+++ b/main-command/src/main/scala/sbt/BasicCommands.scala
@@ -159,7 +159,7 @@ object BasicCommands {
   def completionsParser(state: State): Parser[String] = completionsParser
 
   private def completionsParser: Parser[String] = {
-    val notQuoted = (NotQuoted ~ any.*) map { case (nq, s) => nq + s }
+    val notQuoted = (NotQuoted ~ any.*) map { (nq, s) => nq + s }
     val quotedOrUnquotedSingleArgument = Space ~> (StringVerbatim | StringEscapable | notQuoted)
     token((quotedOrUnquotedSingleArgument ?? "").examples("", " "))
   }
@@ -190,7 +190,7 @@ object BasicCommands {
       state.map(s => (matched(s.nonMultiParser) & cmdPart) | cmdPart)
     val cmdParser = {
       val parser = completionParser.getOrElse(cmdPart).map(_.trim)
-      exclude.foldLeft(parser) { case (p, e) => p & not(OptSpace ~ s"$e ", s"!$e").examples() }
+      exclude.foldLeft(parser) { (p, e) => p & not(OptSpace ~ s"$e ", s"!$e").examples() }
     }
     val multiCmdParser: Parser[String] = token(';') ~> OptSpace ~> cmdParser
 
diff --git a/main-command/src/main/scala/sbt/Command.scala b/main-command/src/main/scala/sbt/Command.scala
index eed78d629..1d4c0d3c4 100644
--- a/main-command/src/main/scala/sbt/Command.scala
+++ b/main-command/src/main/scala/sbt/Command.scala
@@ -228,7 +228,7 @@ object Command {
   def spacedAny(name: String): Parser[String] = spacedC(name, any)
 
   def spacedC(name: String, c: Parser[Char]): Parser[String] =
-    ((c & opOrIDSpaced(name)) ~ c.+) map { case (f, rem) => (f +: rem).mkString }
+    ((c & opOrIDSpaced(name)) ~ c.+) map {  (f, rem) => (f +: rem).mkString }
 }
 
 // format: on
diff --git a/main-command/src/main/scala/sbt/CommandUtil.scala b/main-command/src/main/scala/sbt/CommandUtil.scala
index ff3504031..e97db242f 100644
--- a/main-command/src/main/scala/sbt/CommandUtil.scala
+++ b/main-command/src/main/scala/sbt/CommandUtil.scala
@@ -53,7 +53,7 @@ object CommandUtil {
     }
 
   def singleArgument(exampleStrings: Set[String]): Parser[String] = {
-    val arg = (NotSpaceClass ~ any.*) map { case (ns, s) => (ns +: s).mkString }
+    val arg = (NotSpaceClass ~ any.*) map { (ns, s) => (ns +: s).mkString }
     token(Space) ~> token(arg.examples(exampleStrings))
   }
 
@@ -75,7 +75,7 @@ object CommandUtil {
 
   def searchHelp(selected: String, detailMap: Map[String, String]): Map[String, String] = {
     val pattern = Pattern.compile(selected, HelpPatternFlags)
-    detailMap flatMap { case (k, v) =>
+    detailMap flatMap { (k, v) =>
       val contentMatches = Highlight.showMatches(pattern)(v)
       val keyMatches = Highlight.showMatches(pattern)(k)
       val keyString = Highlight.bold(keyMatches getOrElse k)
@@ -88,7 +88,7 @@ object CommandUtil {
   }
 
   def layoutDetails(details: Map[String, String]): String =
-    details.map { case (k, v) => k + "\n\n  " + v }.mkString("\n", "\n\n", "\n")
+    details.map { (k, v) => k + "\n\n  " + v }.mkString("\n", "\n\n", "\n")
 
   final val HelpPatternFlags = Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
 
diff --git a/main-command/src/main/scala/sbt/internal/classpath/ClassLoaderCache.scala b/main-command/src/main/scala/sbt/internal/classpath/ClassLoaderCache.scala
index f12dcd4e3..c74e59205 100644
--- a/main-command/src/main/scala/sbt/internal/classpath/ClassLoaderCache.scala
+++ b/main-command/src/main/scala/sbt/internal/classpath/ClassLoaderCache.scala
@@ -50,7 +50,7 @@ private[sbt] class ClassLoaderCache(
         }
       }
     )
-  private val scalaProviderKey = miniProvider.map { case (f, cl) =>
+  private val scalaProviderKey = miniProvider.map { (f, cl) =>
     new Key((f -> IO.getModifiedTimeOrZero(f)) :: Nil, commonParent) {
       override def toClassLoader: ClassLoader = cl
     }
@@ -93,7 +93,7 @@ private[sbt] class ClassLoaderCache(
     delegate.asScala.groupBy { case (k, _) => k.parent -> k.files.toSet }.foreach {
       case (_, pairs) if pairs.size > 1 =>
         val max = pairs.map(_._1.maxStamp).max
-        pairs.foreach { case (k, v) => if (k.maxStamp != max) clear(k, v) }
+        pairs.foreach { (k, v) => if (k.maxStamp != max) clear(k, v) }
       case _ =>
     }
     delegate.forEach((k, v) => if (isInvalidated(k.parent)) clear(k, v))
diff --git a/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala b/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
index 3378df979..486e157f5 100644
--- a/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
+++ b/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
@@ -570,7 +570,7 @@ class NetworkClient(
           completions(msg.result match {
             case Some(o: JObject) =>
               o.value
-                .foldLeft(CompletionResponse(Vector.empty[String])) { case (resp, i) =>
+                .foldLeft(CompletionResponse(Vector.empty[String])) { (resp, i) =>
                   if (i.field == "items")
                     resp.withItems(
                       Converter
@@ -651,7 +651,7 @@ class NetworkClient(
             )
           )
       }
-    splitToMessage foreach { case (level, msg) =>
+    splitToMessage foreach { (level, msg) =>
       console.appendLog(level, msg)
     }
   }
diff --git a/main-command/src/main/scala/sbt/internal/util/ReadJsonFromInputStream.scala b/main-command/src/main/scala/sbt/internal/util/ReadJsonFromInputStream.scala
index bccbb4919..b03a97d03 100644
--- a/main-command/src/main/scala/sbt/internal/util/ReadJsonFromInputStream.scala
+++ b/main-command/src/main/scala/sbt/internal/util/ReadJsonFromInputStream.scala
@@ -33,7 +33,7 @@ private[sbt] object ReadJsonFromInputStream {
     var headerBuffer = new Array[Byte](128)
     def expandHeaderBuffer(): Unit = {
       val newHeaderBuffer = new Array[Byte](headerBuffer.length * 2)
-      headerBuffer.view.zipWithIndex.foreach { case (b, i) => newHeaderBuffer(i) = b }
+      headerBuffer.view.zipWithIndex.foreach { (b, i) => newHeaderBuffer(i) = b }
       headerBuffer = newHeaderBuffer
     }
     def getLine(): String = {
diff --git a/main-settings/src/main/scala/sbt/InputTask.scala b/main-settings/src/main/scala/sbt/InputTask.scala
index 37ba37f67..2baba9cb7 100644
--- a/main-settings/src/main/scala/sbt/InputTask.scala
+++ b/main-settings/src/main/scala/sbt/InputTask.scala
@@ -189,7 +189,7 @@ object InputTask:
     override def pure[A1](a: () => A1): InputTask[A1] = InputTask.createFreeFromAction(a)
     override def ap[A1, A2](ff: InputTask[A1 => A2])(in: InputTask[A1]): InputTask[A2] =
       InputTask[A2]((s: State) =>
-        (in.parser(s) ~ ff.parser(s)).map { case (ta1, tf) =>
+        (in.parser(s) ~ ff.parser(s)).map { (ta1, tf) =>
           Task.taskMonad.ap(tf)(ta1)
         }
       )
diff --git a/main-settings/src/main/scala/sbt/Plugins.scala b/main-settings/src/main/scala/sbt/Plugins.scala
index 05c227562..d1e2f8142 100644
--- a/main-settings/src/main/scala/sbt/Plugins.scala
+++ b/main-settings/src/main/scala/sbt/Plugins.scala
@@ -278,7 +278,7 @@ object Plugins extends PluginsFunctions {
     lits map { case Atom(l) => l; case Negated(Atom(l)) => l } mkString (", ")
 
   private def duplicateProvidesError(byAtom: Seq[(Atom, AutoPlugin)]): Unit = {
-    val dupsByAtom = Map(byAtom.groupBy(_._1).toSeq.map { case (k, v) =>
+    val dupsByAtom = Map(byAtom.groupBy(_._1).toSeq.map { (k, v) =>
       k -> v.map(_._2)
     }*)
     val dupStrings =
diff --git a/main-settings/src/main/scala/sbt/Previous.scala b/main-settings/src/main/scala/sbt/Previous.scala
index 3d6381f03..2baf15bdc 100644
--- a/main-settings/src/main/scala/sbt/Previous.scala
+++ b/main-settings/src/main/scala/sbt/Previous.scala
@@ -156,7 +156,7 @@ object Previous {
   def runtime[T](skey: TaskKey[T])(using format: JsonFormat[T]): Initialize[Task[Option[T]]] = {
     type Inputs = (Task[Previous], ScopedKey[Task[T]], References)
     val inputs = (Global / cache, Def.validated(skey, selfRefOk = true), Global / references)
-    Def.app[Inputs, Task[Option[T]]](inputs) { case (prevTask, resolved, refs) =>
+    Def.app[Inputs, Task[Option[T]]](inputs) { (prevTask, resolved, refs) =>
       val key = Key(resolved, resolved)
       refs.recordReference(key, format) // always evaluated on project load
       prevTask.map(_.get(key)) // evaluated if this task is evaluated
@@ -174,7 +174,7 @@ object Previous {
       Global / references,
       Def.resolvedScoped
     )
-    Def.app[Inputs, Task[Option[T]]](inputs) { case (prevTask, resolved, refs, inTask) =>
+    Def.app[Inputs, Task[Option[T]]](inputs) { (prevTask, resolved, refs, inTask) =>
       val key = Key(resolved, inTask.asInstanceOf[ScopedKey[Task[Any]]])
       refs.recordReference(key, format) // always evaluated on project load
       prevTask.map(_.get(key))
diff --git a/main-settings/src/main/scala/sbt/Scope.scala b/main-settings/src/main/scala/sbt/Scope.scala
index 976545915..a643c5858 100644
--- a/main-settings/src/main/scala/sbt/Scope.scala
+++ b/main-settings/src/main/scala/sbt/Scope.scala
@@ -385,9 +385,8 @@ object Scope:
       configInherit: (ResolvedReference, ConfigKey) => Seq[ConfigKey]
   ): DelegateIndex = {
     val pDelegates = refs
-      .map:
-        case (ref, project) =>
-          (ref, delegateIndex(ref, configurations(project))(projectInherit, configInherit))
+      .map: (ref, project) =>
+        (ref, delegateIndex(ref, configurations(project))(projectInherit, configInherit))
       .toMap
     new DelegateIndex0(pDelegates)
   }
diff --git a/main-settings/src/main/scala/sbt/std/Instances.scala b/main-settings/src/main/scala/sbt/std/Instances.scala
index 1bbd22023..e3134b63f 100644
--- a/main-settings/src/main/scala/sbt/std/Instances.scala
+++ b/main-settings/src/main/scala/sbt/std/Instances.scala
@@ -40,7 +40,7 @@ object ParserInstance:
     type F[x] = State => Parser[x]
     override def pure[A1](a: () => A1): State => Parser[A1] = const(DefaultParsers.success(a()))
     override def ap[A1, A2](ff: F[A1 => A2])(fa: F[A1]): F[A2] =
-      (s: State) => (ff(s) ~ fa(s)).map { case (f, a) => f(a) }
+      (s: State) => (ff(s) ~ fa(s)).map { (f, a) => f(a) }
     override def map[A1, A2](fa: F[A1])(f: A1 => A2) =
       (s: State) => fa(s).map(f)
 end ParserInstance
@@ -87,7 +87,7 @@ object FullInstance:
     type Tup = (Task[Initialize[Task[A1]]], Task[SS], [a] => Initialize[a] => Initialize[a])
     Def.app[Tup, Task[A1]]((in, settingsData, Def.capturedTransformations)) {
       case (a: Task[Initialize[Task[A1]]], data: Task[SS], f) =>
-        TaskExtra.multT2Task((a, data)).flatMapN { case (a, d) => f(a).evaluate(d) }
+        TaskExtra.multT2Task((a, data)).flatMapN { (a, d) => f(a).evaluate(d) }
     }
 
   def flattenFun[A1, A2](
@@ -96,7 +96,7 @@ object FullInstance:
     type Tup = (Task[A1 => Initialize[Task[A2]]], Task[SS], [a] => Initialize[a] => Initialize[a])
     Def.app[Tup, A1 => Task[A2]]((in, settingsData, Def.capturedTransformations)) {
       case (a: Task[A1 => Initialize[Task[A2]]] @unchecked, data: Task[SS] @unchecked, f) =>
-        (s: A1) => TaskExtra.multT2Task((a, data)).flatMapN { case (af, d) => f(af(s)).evaluate(d) }
+        (s: A1) => TaskExtra.multT2Task((a, data)).flatMapN { (af, d) => f(af(s)).evaluate(d) }
     }
 
 end FullInstance
diff --git a/main/src/main/scala/sbt/Cross.scala b/main/src/main/scala/sbt/Cross.scala
index 85f4df510..1f9bb700f 100644
--- a/main/src/main/scala/sbt/Cross.scala
+++ b/main/src/main/scala/sbt/Cross.scala
@@ -80,7 +80,7 @@ object Cross {
   private def crossParser(state: State): Parser[CrossArgs] =
     token(CrossCommand <~ OptSpace) flatMap { _ =>
       (token(Parser.opt("-v" <~ Space)) ~ token(matched(state.combinedParser))).map {
-        case (verbose, command) => CrossArgs(command, verbose.isDefined)
+        (verbose, command) => CrossArgs(command, verbose.isDefined)
       }
     }
 
@@ -161,7 +161,7 @@ object Cross {
               "that are configured."
           )
           state.log.debug("Scala versions configuration is:")
-          projCrossVersions.foreach { case (project, versions) =>
+          projCrossVersions.foreach { (project, versions) =>
             state.log.debug(s"$project: $versions")
           }
         }
@@ -185,7 +185,7 @@ object Cross {
           .view
           .mapValues(_.map(_._2).toSet)
         val commandsByVersion = keysByVersion.toSeq
-          .flatMap { case (v, keys) =>
+          .flatMap { (v, keys) =>
             val projects = keys.flatMap(project)
             keys.toSeq.flatMap { k =>
               project(k).withFilter(projects.contains).flatMap { p =>
@@ -205,7 +205,7 @@ object Cross {
           .mapValues(_.map(_._2))
           .toSeq
           .sortBy(_._1)
-        commandsByVersion.flatMap { case (v, commands) =>
+        commandsByVersion.flatMap { (v, commands) =>
           commands match {
             case Seq(c) => Seq(s"$SwitchCommand $verbose $v $c")
             case Seq()  => Nil // should be unreachable
@@ -294,7 +294,7 @@ object Cross {
         excluded: Seq[(ResolvedReference, Seq[ScalaVersion])]
     ) = {
 
-      instance.foreach { case (home, instance) =>
+      instance.foreach { (home, instance) =>
         state.log.info(s"Using Scala home $home with actual version ${instance.actualVersion}")
       }
       if (switch.version.force) {
@@ -302,7 +302,7 @@ object Cross {
       } else {
         included
           .groupBy(_._2)
-          .foreach { case (selectedVersion, projects) =>
+          .foreach { (selectedVersion, projects) =>
             state.log.info(
               s"Setting Scala version to $selectedVersion on ${projects.size} projects."
             )
@@ -333,13 +333,13 @@ object Cross {
       val projectScalaVersions =
         structure.allProjectRefs.map(proj => proj -> crossVersions(extracted, proj))
       if (switch.version.force) {
-        projectScalaVersions.map { case (ref, options) =>
+        projectScalaVersions.map { (ref, options) =>
           (ref, Some(version), options)
         } ++ structure.units.keys
           .map(BuildRef.apply)
           .map(proj => (proj, Some(version), crossVersions(extracted, proj)))
       } else {
-        projectScalaVersions.map { case (project, scalaVersions) =>
+        projectScalaVersions.map { (project, scalaVersions) =>
           val selector = SemanticSelector(version)
           scalaVersions.filter(v => selector.matches(VersionNumber(v))) match {
             case Nil          => (project, None, scalaVersions)
@@ -395,7 +395,7 @@ object Cross {
   ): State = {
     import extracted.*
 
-    val newSettings = projects.flatMap { case (project, version, scalaVersions) =>
+    val newSettings = projects.flatMap { (project, version, scalaVersions) =>
       val scope = Scope(Select(project), Zero, Zero, Zero)
 
       instance match {
diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index a3f52b87c..c04701644 100644
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -648,7 +648,7 @@ object Defaults extends BuildCommon {
     resourceDigests := {
       val uifs = (unmanagedResources / inputFileStamps).value
       val mifs = (managedResources / inputFileStamps).value
-      (uifs ++ mifs).sortBy(_._1.toString()).map { case (p, fileStamp) =>
+      (uifs ++ mifs).sortBy(_._1.toString()).map { (p, fileStamp) =>
         FileStamp.toDigest(p, fileStamp)
       }
     },
@@ -1175,7 +1175,7 @@ object Defaults extends BuildCommon {
         (classLoaderLayeringStrategy),
         thisProject,
         fileConverter,
-      ).flatMapN { case (s, lt, tl, gp, ex, cp, fp, jo, clls, thisProj, c) =>
+      ).flatMapN { (s, lt, tl, gp, ex, cp, fp, jo, clls, thisProj, c) =>
         allTestGroupsTask(
           s,
           lt,
@@ -1330,7 +1330,7 @@ object Defaults extends BuildCommon {
 
   private lazy val inputTests0: Initialize[InputTask[Unit]] = {
     val parser = loadForParser(definedTestNames)((s, i) => testOnlyParser(s, i getOrElse Nil))
-    ParserGen(parser).flatMapTask { case ((selected, frameworkOptions)) =>
+    ParserGen(parser).flatMapTask { (selected, frameworkOptions) =>
       val s = streams.value
       val filter = testFilter.value
       val config = testExecution.value
@@ -1367,7 +1367,7 @@ object Defaults extends BuildCommon {
   ): Map[TestFramework, Runner] = {
     import Tests.Argument
     val opts = config.options.toList
-    frameworks.map { case (tf, f) =>
+    frameworks.map { (tf, f) =>
       val args = opts.flatMap {
         case Argument(None | Some(`tf`), args) => args
         case _                                 => Nil
@@ -1489,7 +1489,7 @@ object Defaults extends BuildCommon {
     }
     val output = Tests.foldTasks(groupTasks, config.parallel)
     val result = output map { out =>
-      out.events.foreach { case (suite, e) =>
+      out.events.foreach { (suite, e) =>
         if (
           strategy != ClassLoaderLayeringStrategy.Flat ||
           strategy != ClassLoaderLayeringStrategy.ScalaLibrary
@@ -1531,7 +1531,7 @@ object Defaults extends BuildCommon {
         }
       }
       val summaries =
-        runners map { case (tf, r) =>
+        runners map { (tf, r) =>
           Tests.Summary(frameworks(tf).name, r.done())
         }
       out.copy(summaries = summaries)
@@ -1607,7 +1607,7 @@ object Defaults extends BuildCommon {
       xs
         .flatMap(Path.allSubpaths)
         .withFilter(_._1.isFile())
-        .map { case (p, path) =>
+        .map { (p, path) =>
           val vf = converter.toVirtualFile(p.toPath())
           (vf: HashedVirtualFileRef) -> path
         }
@@ -1621,7 +1621,7 @@ object Defaults extends BuildCommon {
         .allSubpaths(d)
         .toSeq
         .withFilter(_._1.isFile())
-        .map { case (p, path) =>
+        .map { (p, path) =>
           val vf = converter.toVirtualFile(p.toPath())
           (vf: HashedVirtualFileRef) -> path
         }
@@ -1659,7 +1659,7 @@ object Defaults extends BuildCommon {
           case s if !exclude(s) => relative(s).map(s -> _)
           case _                => None
         }
-        .map { case (p, path) =>
+        .map { (p, path) =>
           val vf = converter.toVirtualFile(p.toPath())
           (vf: HashedVirtualFileRef) -> path
         }
@@ -1681,7 +1681,7 @@ object Defaults extends BuildCommon {
           case r if !rdirs(r) => relative(r).map(r -> _)
           case _              => None
         }
-        .map { case (p, path) =>
+        .map { (p, path) =>
           val vf = converter.toVirtualFile(p.toPath())
           (vf: HashedVirtualFileRef) -> path
         }
@@ -2126,7 +2126,7 @@ object Defaults extends BuildCommon {
           val allDeps = allDependencies.value
           (hasScala, hasJava) match {
             case (true, _) =>
-              val xapisFiles = xapis.map { case (k, v) =>
+              val xapisFiles = xapis.map { (k, v) =>
                 converter.toPath(k).toFile() -> v
               }
               val options = sOpts ++ Opts.doc.externalAPI(xapisFiles)
@@ -2979,7 +2979,7 @@ object Classpaths {
       IO.copyFile(file, targetFile)
       artifact.withName(nameWithSuffix) -> converter.toVirtualFile(targetFile.toPath)
     }
-    legacyPackages.map { case (artifact, file) =>
+    legacyPackages.map { (artifact, file) =>
       copyArtifact(artifact, file);
     }
 
@@ -3887,36 +3887,36 @@ object Classpaths {
       publishMavenStyle.toTaskable,
       compatibilityWarningOptions.toTaskable,
     ).mapN {
-      case (
-            lm,
-            s,
-            conf,
-            maybeUpdateLevel,
-            ucn,
-            state0,
-            sv,
-            ac,
-            usiOnly,
-            dcd,
-            ct,
-            er,
-            rs,
-            fup,
-            isPlugin,
-            thisRef,
-            im,
-            so,
-            sk,
-            tu,
-            uwConfig,
-            eel,
-            lds,
-            aeel,
-            avs,
-            avsj,
-            mavenStyle,
-            cwo,
-          ) =>
+      (
+          lm,
+          s,
+          conf,
+          maybeUpdateLevel,
+          ucn,
+          state0,
+          sv,
+          ac,
+          usiOnly,
+          dcd,
+          ct,
+          er,
+          rs,
+          fup,
+          isPlugin,
+          thisRef,
+          im,
+          so,
+          sk,
+          tu,
+          uwConfig,
+          eel,
+          lds,
+          aeel,
+          avs,
+          avsj,
+          mavenStyle,
+          cwo,
+      ) =>
         val cacheDirectory = ct / cacheLabel / ucn
         val cacheStoreFactory: CacheStoreFactory = {
           val factory =
@@ -4159,7 +4159,7 @@ object Classpaths {
   private[sbt] def depMap: Initialize[Task[Map[ModuleRevisionId, ModuleDescriptor]]] =
     import sbt.TupleSyntax.*
     (buildDependencies.toTaskable, thisProjectRef.toTaskable, settingsData, streams).flatMapN {
-      case (bd, thisProj, data, s) =>
+      (bd, thisProj, data, s) =>
         depMap(bd.classpathTransitiveRefs(thisProj), data, s.log)
     }
 
@@ -4252,7 +4252,7 @@ object Classpaths {
       data: Def.Settings,
       deps: BuildDependencies
   ): Seq[(ProjectRef, ConfigRef)] =
-    interSort(projectRef, conf, data, deps).map { case (projectRef, configName) =>
+    interSort(projectRef, conf, data, deps).map { (projectRef, configName) =>
       (projectRef, ConfigRef(configName))
     }
 
@@ -4396,7 +4396,7 @@ object Classpaths {
   private lazy val internalCompilerPluginClasspath: Initialize[Task[Classpath]] =
     (Def
       .task { (thisProjectRef.value, settingsData.value, buildDependencies.value, streams.value) })
-      .flatMapTask { case (ref, data, deps, s) =>
+      .flatMapTask { (ref, data, deps, s) =>
         ClasspathImpl.internalDependenciesImplTask(
           ref,
           CompilerPlugin,
@@ -4737,7 +4737,7 @@ trait BuildExtra extends BuildCommon with DefExtra {
         scoped.scopedKey,
         ClassLoaders.runner.mapReferenced(Project.mapScope(_.rescope(config))),
       ).zipWith(Def.task { ((config / fullClasspath).value, streams.value, fileConverter.value) }) {
-        case (rTask, t) =>
+        (rTask, t) =>
           (t, rTask).mapN { case ((cp, s, converter), r) =>
             given FileConverter = converter
             r.run(mainClass, cp.files, arguments, s.log).get
diff --git a/main/src/main/scala/sbt/Main.scala b/main/src/main/scala/sbt/Main.scala
index 5c45bc44f..3d63a6e9d 100644
--- a/main/src/main/scala/sbt/Main.scala
+++ b/main/src/main/scala/sbt/Main.scala
@@ -633,7 +633,7 @@ object BuiltinCommands {
     SettingCompletions.setThis(extracted, settings, arg)
 
   def inspect: Command = Command(InspectCommand, inspectBrief, inspectDetailed)(Inspect.parser) {
-    case (s, f) =>
+    (s, f) =>
       s.log.info(f())
       s
   }
diff --git a/main/src/main/scala/sbt/Opts.scala b/main/src/main/scala/sbt/Opts.scala
index 6873c293f..7ae69a7bb 100644
--- a/main/src/main/scala/sbt/Opts.scala
+++ b/main/src/main/scala/sbt/Opts.scala
@@ -37,7 +37,7 @@ object Opts {
       if (mappings.isEmpty) Nil
       else
         mappings
-          .map { case (f, u) => s"${f.getAbsolutePath}#${u.toURL().toExternalForm}" }
+          .map { (f, u) => s"${f.getAbsolutePath}#${u.toURL().toExternalForm}" }
           .mkString("-doc-external-doc:", ",", "") :: Nil
   }
   object resolver {
diff --git a/main/src/main/scala/sbt/PluginCross.scala b/main/src/main/scala/sbt/PluginCross.scala
index 93c86d3a9..f6fd033ee 100644
--- a/main/src/main/scala/sbt/PluginCross.scala
+++ b/main/src/main/scala/sbt/PluginCross.scala
@@ -76,7 +76,7 @@ private[sbt] object PluginCross {
         .getOrElse(Nil)
         .toList
     }
-    Command.arb(requireSession(crossParser), pluginCrossHelp) { case (state, command) =>
+    Command.arb(requireSession(crossParser), pluginCrossHelp) { (state, command) =>
       val x = Project.extract(state)
       import x.*
       val versions = crossVersions(state)
diff --git a/main/src/main/scala/sbt/ProjectExtra.scala b/main/src/main/scala/sbt/ProjectExtra.scala
index 937b3f28f..63aa3eeec 100755
--- a/main/src/main/scala/sbt/ProjectExtra.scala
+++ b/main/src/main/scala/sbt/ProjectExtra.scala
@@ -516,7 +516,7 @@ trait ProjectExtra extends Scoped.Syntax:
     private[sbt] def usedBy(structure: BuildStructure, actual: Boolean, key: AttributeKey[?])(using
         display: Show[ScopedKey[?]]
     ): Seq[ScopedKey[?]] =
-      relation(structure, actual)(using display).all.toSeq flatMap { case (a, b) =>
+      relation(structure, actual)(using display).all.toSeq flatMap { (a, b) =>
         if (b.key == key) List[ScopedKey[?]](a) else Nil
       }
 
diff --git a/main/src/main/scala/sbt/ProjectMatrix.scala b/main/src/main/scala/sbt/ProjectMatrix.scala
index 8b3df8338..86a59a0f3 100644
--- a/main/src/main/scala/sbt/ProjectMatrix.scala
+++ b/main/src/main/scala/sbt/ProjectMatrix.scala
@@ -655,7 +655,7 @@ object ProjectMatrix {
       new AxisBaseProjectFinder(axisValues.toSeq)
 
     override def allProjects(): Seq[(Project, Seq[VirtualAxis])] =
-      resolvedMappings.map { case (row, project) =>
+      resolvedMappings.map { (row, project) =>
         project -> row.axisValues
       }.toSeq
 
diff --git a/main/src/main/scala/sbt/RemoteCache.scala b/main/src/main/scala/sbt/RemoteCache.scala
index a4bc02876..ac8ae3750 100644
--- a/main/src/main/scala/sbt/RemoteCache.scala
+++ b/main/src/main/scala/sbt/RemoteCache.scala
@@ -268,17 +268,17 @@ object RemoteCache {
       remoteCacheId := {
         val inputs = (unmanagedSources / inputFileStamps).value
         val cp = (externalDependencyClasspath / outputFileStamps).?.value.getOrElse(Nil)
-        val extraInc = (extraIncOptions.value) flatMap { case (k, v) =>
+        val extraInc = (extraIncOptions.value) flatMap { (k, v) =>
           Vector(k, v)
         }
         combineHash(extractHash(inputs) ++ extractHash(cp) ++ extraInc)
       },
       pushRemoteCacheConfiguration := {
         val converter = fileConverter.value
-        val artifacts = (pushRemoteCacheConfiguration / packagedArtifacts).value.toVector.map {
-          case (a, vf) =>
+        val artifacts =
+          (pushRemoteCacheConfiguration / packagedArtifacts).value.toVector.map { (a, vf) =>
             a -> converter.toPath(vf).toFile
-        }
+          }
         Classpaths.publishConfig(
           (pushRemoteCacheConfiguration / publishMavenStyle).value,
           Classpaths.deliverPattern(crossTarget.value),
diff --git a/main/src/main/scala/sbt/ScopeFilter.scala b/main/src/main/scala/sbt/ScopeFilter.scala
index 276db87e2..f93d83f48 100644
--- a/main/src/main/scala/sbt/ScopeFilter.scala
+++ b/main/src/main/scala/sbt/ScopeFilter.scala
@@ -223,8 +223,8 @@ object ScopeFilter {
     val grouped: ScopeMap =
       scopes
         .groupBy(_.project)
-        .map { case (k, v) =>
-          k -> v.groupBy(_.config).map { case (k, v) => k -> v.groupBy(_.task) }
+        .map { (k, v) =>
+          k -> v.groupBy(_.config).map { (k, v) => k -> v.groupBy(_.task) }
         }
     new AllScopes(scopes, grouped)
   }
diff --git a/main/src/main/scala/sbt/TemplateCommandUtil.scala b/main/src/main/scala/sbt/TemplateCommandUtil.scala
index 904ec3f89..069244ea3 100644
--- a/main/src/main/scala/sbt/TemplateCommandUtil.scala
+++ b/main/src/main/scala/sbt/TemplateCommandUtil.scala
@@ -191,7 +191,7 @@ private[sbt] object TemplateCommandUtil {
     else
       ITerminal.withStreams(true, false) {
         assert(templates.size <= 20, "template list cannot have more than 20 items")
-        val mappingList = templates.zipWithIndex.map { case (v, idx) =>
+        val mappingList = templates.zipWithIndex.map { (v, idx) =>
           toLetter(idx) -> v
         }
         val out = term.printStream
diff --git a/main/src/main/scala/sbt/coursierint/CoursierInputsTasks.scala b/main/src/main/scala/sbt/coursierint/CoursierInputsTasks.scala
index e03884555..2cdfe1643 100644
--- a/main/src/main/scala/sbt/coursierint/CoursierInputsTasks.scala
+++ b/main/src/main/scala/sbt/coursierint/CoursierInputsTasks.scala
@@ -109,7 +109,7 @@ object CoursierInputsTasks {
     CModule(
       COrganization(id.getOrganisation),
       CModuleName(id.getName),
-      id.getExtraAttributes.asScala.map { case (k0, v0) =>
+      id.getExtraAttributes.asScala.map { (k0, v0) =>
         k0.asInstanceOf[String] -> v0.asInstanceOf[String]
       }.toMap
     )
@@ -155,7 +155,7 @@ object CoursierInputsTasks {
       c => m.getOrElse(c, CPublication("", CType(""), CExtension(""), CClassifier("")))
     }
 
-    configurations.map { case (from, to) =>
+    configurations.map { (from, to) =>
       from -> dependency(to, publications(to))
     }
   }
@@ -181,14 +181,14 @@ object CoursierInputsTasks {
 
       // this includes org.scala-sbt:global-plugins referenced from meta-builds in particular
       sbt.Keys.projectDescriptors.value
-        .map { case (k, v) =>
+        .map { (k, v) =>
           moduleFromIvy(k) -> v
         }
         .filter { case (module, _) =>
           !projectModules(module)
         }
         .toVector
-        .map { case (module, v) =>
+        .map { (module, v) =>
           val configurations = v.getConfigurations.map { c =>
             CConfiguration(c.getName) -> c.getExtends.map(CConfiguration(_)).toSeq
           }.toMap
diff --git a/main/src/main/scala/sbt/coursierint/CoursierRepositoriesTasks.scala b/main/src/main/scala/sbt/coursierint/CoursierRepositoriesTasks.scala
index 60f53dc77..f08479688 100644
--- a/main/src/main/scala/sbt/coursierint/CoursierRepositoriesTasks.scala
+++ b/main/src/main/scala/sbt/coursierint/CoursierRepositoriesTasks.scala
@@ -133,7 +133,7 @@ object CoursierRepositoriesTasks {
         val dependencyRefs = Project.transitiveInterDependencies(s, projectRef)
         (ScopeFilter(inProjects(projectRef)), ScopeFilter(inProjects(dependencyRefs*)))
       })
-      .flatMapTask { case (filter1, filter2) =>
+      .flatMapTask { (filter1, filter2) =>
         Def.task {
           val resolvers = csrResolvers.all(filter1).value ++ csrResolvers.all(filter2).value
           resolvers.flatten
diff --git a/main/src/main/scala/sbt/coursierint/LMCoursier.scala b/main/src/main/scala/sbt/coursierint/LMCoursier.scala
index 2631c142e..a0366f9c3 100644
--- a/main/src/main/scala/sbt/coursierint/LMCoursier.scala
+++ b/main/src/main/scala/sbt/coursierint/LMCoursier.scala
@@ -106,7 +106,7 @@ object LMCoursier {
         log
       )
       .toVector
-      .map { case (o, n) =>
+      .map { (o, n) =>
         (o.value, n.value)
       }
       .sorted
diff --git a/main/src/main/scala/sbt/internal/BuildLoader.scala b/main/src/main/scala/sbt/internal/BuildLoader.scala
index 3543c7b0e..1d48ab04f 100644
--- a/main/src/main/scala/sbt/internal/BuildLoader.scala
+++ b/main/src/main/scala/sbt/internal/BuildLoader.scala
@@ -56,7 +56,7 @@ final class MultiHandler[S, T](
   def setRoot(resolver: S => Option[T]) =
     new MultiHandler(builtIn, Some(resolver), nonRoots, getURI, log)
   def applyNonRoots(info: S): List[(URI, T)] =
-    nonRoots flatMap { case (definingURI, loader) =>
+    nonRoots flatMap { (definingURI, loader) =>
       loader(info) map { unit =>
         (definingURI, unit)
       }
diff --git a/main/src/main/scala/sbt/internal/BuildStructure.scala b/main/src/main/scala/sbt/internal/BuildStructure.scala
index 7379949b7..7d39807df 100644
--- a/main/src/main/scala/sbt/internal/BuildStructure.scala
+++ b/main/src/main/scala/sbt/internal/BuildStructure.scala
@@ -60,7 +60,7 @@ final class BuildStructure(
 
   /** Foreach project in each build apply the specified function. */
   private def eachBuild[A](f: (URI, ResolvedProject) => A): Seq[A] =
-    units.iterator.flatMap { case (build, unit) => unit.projects.map(f(build, _)) }.toIndexedSeq
+    units.iterator.flatMap { (build, unit) => unit.projects.map(f(build, _)) }.toIndexedSeq
 
   /** Foreach project in the specified build apply the specified function. */
   private def eachProject[A](build: URI, f: ResolvedProject => A): Seq[A] =
@@ -266,7 +266,7 @@ final class LoadedBuild(val root: URI, val units: Map[URI, LoadedBuildUnit]) {
   BuildUtil.checkCycles(units)
 
   def allProjectRefs: Seq[(ProjectRef, ResolvedProject)] =
-    units.iterator.flatMap { case (build, unit) =>
+    units.iterator.flatMap { (build, unit) =>
       unit.projects.map(p => ProjectRef(build, p.id) -> p)
     }.toIndexedSeq
 
diff --git a/main/src/main/scala/sbt/internal/ClasspathImpl.scala b/main/src/main/scala/sbt/internal/ClasspathImpl.scala
index 17134421e..abc9212aa 100644
--- a/main/src/main/scala/sbt/internal/ClasspathImpl.scala
+++ b/main/src/main/scala/sbt/internal/ClasspathImpl.scala
@@ -325,7 +325,7 @@ private[sbt] object ClasspathImpl {
       trackIfMissing: TaskKey[Seq[A]],
       trackAlways: TaskKey[Seq[A]]
   ): Task[Seq[A]] = {
-    val interDepConfigs = interSort(projectRef, conf, data, deps) filter { case (dep, c) =>
+    val interDepConfigs = interSort(projectRef, conf, data, deps) filter { (dep, c) =>
       includeSelf || (dep != projectRef) || (conf.name != c && self.name != c)
     }
     val tasks = (new LinkedHashSet[Task[Seq[A]]]).asScala
diff --git a/main/src/main/scala/sbt/internal/Clean.scala b/main/src/main/scala/sbt/internal/Clean.scala
index ec7f9dad7..4a307fbd6 100644
--- a/main/src/main/scala/sbt/internal/Clean.scala
+++ b/main/src/main/scala/sbt/internal/Clean.scala
@@ -99,7 +99,7 @@ private[sbt] object Clean {
         val manager = streamsManager.value
         (state, extracted, view, manager)
       })
-      .flatMapTask { case (state, extracted, view, manager) =>
+      .flatMapTask { (state, extracted, view, manager) =>
         Def.task {
           val excludeFilter = cleanFilter(scope).value
           val delete = cleanDelete(scope).value
diff --git a/main/src/main/scala/sbt/internal/Continuous.scala b/main/src/main/scala/sbt/internal/Continuous.scala
index 098e08412..9b2d29f3f 100644
--- a/main/src/main/scala/sbt/internal/Continuous.scala
+++ b/main/src/main/scala/sbt/internal/Continuous.scala
@@ -356,9 +356,8 @@ private[sbt] object Continuous extends DeprecatedContinuous {
   ): (Watch.Action, String, Int, State) => State = {
     configs.flatMap(_.watchSettings.onTermination).distinct match {
       case Seq(head, tail*) =>
-        tail.foldLeft(head) { case (onTermination, configOnTermination) =>
-          (action, cmd, count, state) =>
-            configOnTermination(action, cmd, count, onTermination(action, cmd, count, state))
+        tail.foldLeft(head) { (onTermination, configOnTermination) => (action, cmd, count, state) =>
+          configOnTermination(action, cmd, count, onTermination(action, cmd, count, state))
         }
       case _ =>
         if (isCommand) Watch.defaultCommandOnTermination else Watch.defaultTaskOnTermination
@@ -636,7 +635,7 @@ private[sbt] object Continuous extends DeprecatedContinuous {
           val actions = events.flatMap(onEvent(count, _))
           if (actions.exists(_._2 != Watch.Ignore)) {
             val builder = new StringBuilder
-            val min = actions.minBy { case (e, a) =>
+            val min = actions.minBy { (e, a) =>
               if (builder.nonEmpty) builder.append(", ")
               val path = e.path
               builder.append(path)
@@ -777,7 +776,7 @@ private[sbt] object Continuous extends DeprecatedContinuous {
       val default: String => Watch.Action =
         string => parse(inputStream(string), systemInBuilder, fullParser)
       val alt = alternative
-        .map { case (key, handler) =>
+        .map { (key, handler) =>
           val is = extracted.runTask(key, state)._2
           () => handler(is)
         }
diff --git a/main/src/main/scala/sbt/internal/CrossJava.scala b/main/src/main/scala/sbt/internal/CrossJava.scala
index 2f4f8769d..4dade4805 100644
--- a/main/src/main/scala/sbt/internal/CrossJava.scala
+++ b/main/src/main/scala/sbt/internal/CrossJava.scala
@@ -105,7 +105,7 @@ private[sbt] object CrossJava {
   }
 
   def lookupJavaHome(jv: String, mappings: Map[String, File]): File = {
-    val ms = mappings map { case (k, v) => (JavaVersion(k), v) }
+    val ms = mappings map { (k, v) => (JavaVersion(k), v) }
     lookupJavaHome(JavaVersion(jv), ms)
   }
 
@@ -115,7 +115,7 @@ private[sbt] object CrossJava {
 
       // when looking for "10" it should match "openjdk@10"
       case None if jv.vendor.isEmpty =>
-        val noVendors: Map[JavaVersion, File] = mappings map { case (k, v) =>
+        val noVendors: Map[JavaVersion, File] = mappings map { (k, v) =>
           k.withVendor(None) -> v
         }
         noVendors.get(jv).getOrElse(javaHomeNotFound(jv, mappings))
@@ -178,7 +178,7 @@ private[sbt] object CrossJava {
       extracted: Extracted,
       proj: ResolvedReference
   ): Map[JavaVersion, File] = {
-    getJavaHomes(extracted, proj) map { case (k, v) => (JavaVersion(k), v) }
+    getJavaHomes(extracted, proj) map { (k, v) => (JavaVersion(k), v) }
   }
 
   private def getCrossJavaVersions(
@@ -217,7 +217,7 @@ private[sbt] object CrossJava {
         switch.target.version match {
           case None => projectJavaVersions
           case Some(v) =>
-            projectJavaVersions flatMap { case (proj, versions) =>
+            projectJavaVersions flatMap { (proj, versions) =>
               if (versions.isEmpty || versions.contains[String](v.toString))
                 Vector(proj -> versions)
               else Vector()
@@ -226,7 +226,7 @@ private[sbt] object CrossJava {
     }
 
     def setJavaHomeForProjects: State = {
-      val newSettings = projects.flatMap { case (proj, javaVersions) =>
+      val newSettings = projects.flatMap { (proj, javaVersions) =>
         val fjh = getJavaHomesTyped(extracted, proj)
         val home = switch.target match {
           case SwitchTarget(Some(v), _, _) => lookupJavaHome(v, fjh)
@@ -273,7 +273,7 @@ private[sbt] object CrossJava {
   private def crossParser(state: State): Parser[CrossArgs] =
     token(JavaCrossCommand <~ OptSpace) flatMap { _ =>
       (token(Parser.opt("-v" <~ Space)) ~ token(matched(state.combinedParser))).map {
-        case (verbose, command) => CrossArgs(command, verbose.isDefined)
+        (verbose, command) => CrossArgs(command, verbose.isDefined)
       } & spacedFirst(JavaCrossCommand)
     }
 
@@ -286,7 +286,7 @@ private[sbt] object CrossJava {
     }
     // if we support javaHome, projVersions should be cached somewhere since
     // running ++2.11.1 is at the root level is going to mess with the scalaVersion for the aggregated subproj
-    val projVersions = (projCrossVersions flatMap { case (proj, versions) =>
+    val projVersions = (projCrossVersions flatMap { (proj, versions) =>
       versions map { proj.project -> _ }
     }).toList
 
@@ -313,7 +313,7 @@ private[sbt] object CrossJava {
                 "that are configured."
             )
             state.log.debug("Java versions configuration is:")
-            projCrossVersions.foreach { case (project, versions) =>
+            projCrossVersions.foreach { (project, versions) =>
               state.log.debug(s"$project: $versions")
             }
           }
@@ -515,15 +515,15 @@ private[sbt] object CrossJava {
     else s
 
   def expandJavaHomes(hs: Map[String, File]): Map[String, File] = {
-    val parsed = hs map { case (k, v) =>
+    val parsed = hs map { (k, v) =>
       JavaVersion(k) -> v
     }
     // first ignore vnd
-    val withAndWithoutVnd = parsed flatMap { case (k, v) =>
+    val withAndWithoutVnd = parsed flatMap { (k, v) =>
       if (k.vendor.isDefined) Vector(k -> v, k.withVendor(None) -> v)
       else Vector(k -> v)
     }
-    val normalizeNumbers = withAndWithoutVnd flatMap { case (k, v) =>
+    val normalizeNumbers = withAndWithoutVnd flatMap { (k, v) =>
       k.numbers match {
         case Vector(1L, minor, _*) =>
           Vector(k -> v, k.withNumbers(Vector(minor)) -> v)
@@ -535,7 +535,7 @@ private[sbt] object CrossJava {
           Vector(k -> v)
       }
     }
-    val result: Map[String, File] = normalizeNumbers map { case (k, v) =>
+    val result: Map[String, File] = normalizeNumbers map { (k, v) =>
       (k.toString -> v)
     }
     result
diff --git a/main/src/main/scala/sbt/internal/FastTrackCommands.scala b/main/src/main/scala/sbt/internal/FastTrackCommands.scala
index da84350f8..1b8568e96 100644
--- a/main/src/main/scala/sbt/internal/FastTrackCommands.scala
+++ b/main/src/main/scala/sbt/internal/FastTrackCommands.scala
@@ -29,7 +29,7 @@ private[sbt] object FastTrackCommands {
         case l               => None
       }
   private val commands = Map[String, (State, String) => Option[State]](
-    FailureWall -> { case (s, c) => if (c == FailureWall) Some(s) else None },
+    FailureWall -> { (s, c) => if (c == FailureWall) Some(s) else None },
     StashOnFailure -> fromCommand(StashOnFailure, stashOnFailure, arguments = false),
     PopOnFailure -> fromCommand(PopOnFailure, popOnFailure, arguments = false),
     Shell -> fromCommand(Shell, shell),
diff --git a/main/src/main/scala/sbt/internal/IncrementalTest.scala b/main/src/main/scala/sbt/internal/IncrementalTest.scala
index 632443ab0..cd0926488 100644
--- a/main/src/main/scala/sbt/internal/IncrementalTest.scala
+++ b/main/src/main/scala/sbt/internal/IncrementalTest.scala
@@ -126,14 +126,14 @@ private[sbt] object TestStatus:
     val props = Properties()
     IO.load(props, f)
     val result = ConcurrentHashMap[String, Digest]()
-    props.asScala.iterator.foreach { case (k, v) => result.put(k, Digest(v)) }
+    props.asScala.iterator.foreach { (k, v) => result.put(k, Digest(v)) }
     result.asScala
 
   def write(map: collection.Map[String, Digest], label: String, f: File): Unit =
     IO.writeLines(
       f,
       s"# $label" ::
-        map.toList.sortBy(_._1).map { case (k, v) =>
+        map.toList.sortBy(_._1).map { (k, v) =>
           s"$k=$v"
         }
     )
diff --git a/main/src/main/scala/sbt/internal/Inspect.scala b/main/src/main/scala/sbt/internal/Inspect.scala
index d1b441325..27b1b201d 100644
--- a/main/src/main/scala/sbt/internal/Inspect.scala
+++ b/main/src/main/scala/sbt/internal/Inspect.scala
@@ -59,7 +59,7 @@ object Inspect {
   }
 
   def commandHandler(s: State, mode: Mode): Parser[() => String] = {
-    Space ~> commandParser(s).flatMap { case (name, cmd) =>
+    Space ~> commandParser(s).flatMap { (name, cmd) =>
       cmd.tags.get(BasicCommands.CommandAliasKey) match {
         case Some((_, aliasFor)) =>
           def header = s"Alias for: $aliasFor"
diff --git a/main/src/main/scala/sbt/internal/JarClassPath.scala b/main/src/main/scala/sbt/internal/JarClassPath.scala
index 8837d86e4..6888c1cb1 100644
--- a/main/src/main/scala/sbt/internal/JarClassPath.scala
+++ b/main/src/main/scala/sbt/internal/JarClassPath.scala
@@ -51,6 +51,6 @@ private[internal] final class JarClassPath(val jars: Seq[File]) {
    * This is a stricter equality requirement than equals that we can use for cache invalidation.
    */
   private[internal] def strictEquals(that: JarClassPath): Boolean = {
-    this.equals(that) && !this.snapshots.view.zip(that.snapshots).exists { case (l, r) => l != r }
+    this.equals(that) && !this.snapshots.view.zip(that.snapshots).exists { (l, r) => l != r }
   }
 }
diff --git a/main/src/main/scala/sbt/internal/LibraryManagement.scala b/main/src/main/scala/sbt/internal/LibraryManagement.scala
index beae6503f..113c1e9c8 100644
--- a/main/src/main/scala/sbt/internal/LibraryManagement.scala
+++ b/main/src/main/scala/sbt/internal/LibraryManagement.scala
@@ -302,30 +302,30 @@ private[sbt] object LibraryManagement {
       Keys.sourceArtifactTypes.toTaskable,
       Keys.docArtifactTypes.toTaskable,
     ).mapN {
-      case (
-            lm,
-            state0,
-            s,
-            conf,
-            maybeUpdateLevel,
-            er,
-            rs,
-            fup,
-            im,
-            ucn,
-            thisRef,
-            sk,
-            tu,
-            uwConfig,
-            mavenStyle,
-            cwo,
-            ivySbt0,
-            mod,
-            dcd,
-            app,
-            srcTypes,
-            docTypes,
-          ) =>
+      (
+          lm,
+          state0,
+          s,
+          conf,
+          maybeUpdateLevel,
+          er,
+          rs,
+          fup,
+          im,
+          ucn,
+          thisRef,
+          sk,
+          tu,
+          uwConfig,
+          mavenStyle,
+          cwo,
+          ivySbt0,
+          mod,
+          dcd,
+          app,
+          srcTypes,
+          docTypes,
+      ) =>
         import Keys.*
         val cacheDirectory = s.cacheDirectory
         val isRoot = er.contains(rs)
diff --git a/main/src/main/scala/sbt/internal/Load.scala b/main/src/main/scala/sbt/internal/Load.scala
index 147a5379b..db4cefeca 100755
--- a/main/src/main/scala/sbt/internal/Load.scala
+++ b/main/src/main/scala/sbt/internal/Load.scala
@@ -315,7 +315,7 @@ private[sbt] object Load {
     val dups = overlappingTargets(allTargets(data))
     if (dups.isEmpty) None
     else {
-      val dupStr = dups.map { case (dir, scopes) =>
+      val dupStr = dups.map { (dir, scopes) =>
         s"${dir.getAbsolutePath}:\n\t${scopes.mkString("\n\t")}"
       }.mkString
       Some(s"Overlapping output directories:$dupStr")
@@ -380,7 +380,7 @@ private[sbt] object Load {
     val scopedKeys = keys ++ data.keys
     val projectsMap = projects.view.mapValues(_.defined.keySet).toMap
     val configsMap: Map[String, Seq[Configuration]] =
-      projects.values.flatMap(bu => bu.defined map { case (k, v) => (k, v.configurations) }).toMap
+      projects.values.flatMap(bu => bu.defined map { (k, v) => (k, v.configurations) }).toMap
     val keyIndex = KeyIndex(scopedKeys, projectsMap, configsMap)
     val aggIndex = KeyIndex.aggregate(scopedKeys, extra(keyIndex), projectsMap, configsMap)
     new StructureIndex(
@@ -432,9 +432,9 @@ private[sbt] object Load {
     (((GlobalScope / loadedBuild) :== loaded) +:
       transformProjectOnly(loaded.root, rootProject, injectSettings.global)) ++
       inScope(GlobalScope)(loaded.autos.globalSettings) ++
-      loaded.units.toSeq.flatMap { case (uri, build) =>
+      loaded.units.toSeq.flatMap { (uri, build) =>
         val pluginBuildSettings = loaded.autos.buildSettings(uri)
-        val projectSettings = build.defined flatMap { case (id, project) =>
+        val projectSettings = build.defined flatMap { (id, project) =>
           val ref = ProjectRef(uri, id)
           val defineConfig: Seq[Setting[?]] =
             for (c <- project.configurations)
@@ -667,7 +667,7 @@ private[sbt] object Load {
 
   def resolveAll(builds: Map[URI, PartBuildUnit]): Map[URI, LoadedBuildUnit] = {
     val rootProject = getRootProject(builds)
-    builds map { case (uri, unit) =>
+    builds map { (uri, unit) =>
       (uri, unit.resolveRefs(ref => Scope.resolveProjectRef(uri, rootProject, ref)))
     }
   }
@@ -706,7 +706,7 @@ private[sbt] object Load {
 
   def resolveProjects(loaded: PartBuild): LoadedBuild = {
     val rootProject = getRootProject(loaded.units)
-    val units = loaded.units map { case (uri, unit) =>
+    val units = loaded.units map { (uri, unit) =>
       IO.assertAbsolute(uri)
       (uri, resolveProjects(uri, unit, rootProject))
     }
diff --git a/main/src/main/scala/sbt/internal/PluginDiscovery.scala b/main/src/main/scala/sbt/internal/PluginDiscovery.scala
index 010194238..65f6a81d0 100644
--- a/main/src/main/scala/sbt/internal/PluginDiscovery.scala
+++ b/main/src/main/scala/sbt/internal/PluginDiscovery.scala
@@ -56,9 +56,8 @@ object PluginDiscovery:
       "sbt.plugins.MiniDependencyTreePlugin" -> sbt.plugins.MiniDependencyTreePlugin,
     )
     val detectedAutoPlugins = discover[AutoPlugin](AutoPlugins)
-    val allAutoPlugins = (defaultAutoPlugins ++ detectedAutoPlugins.modules) map {
-      case (name, value) =>
-        DetectedAutoPlugin(name, value, sbt.Plugins.hasAutoImportGetter(value, loader))
+    val allAutoPlugins = (defaultAutoPlugins ++ detectedAutoPlugins.modules) map { (name, value) =>
+      DetectedAutoPlugin(name, value, sbt.Plugins.hasAutoImportGetter(value, loader))
     }
     new DetectedPlugins(allAutoPlugins, discover[BuildDef](Builds))
   }
@@ -186,7 +185,7 @@ object PluginDiscovery:
     val evictedModules = evicted.map { id =>
       (id.organization, id.name)
     }.distinct
-    val evictedStrings = evictedModules map { case (o, n) => o + ":" + n }
+    val evictedStrings = evictedModules map { (o, n) => o + ":" + n }
     val msgBase = "Binary incompatibility in plugins detected."
     val msgExtra =
       if (evictedStrings.isEmpty) ""
diff --git a/main/src/main/scala/sbt/internal/PluginsDebug.scala b/main/src/main/scala/sbt/internal/PluginsDebug.scala
index 54d385c6d..21714dde7 100644
--- a/main/src/main/scala/sbt/internal/PluginsDebug.scala
+++ b/main/src/main/scala/sbt/internal/PluginsDebug.scala
@@ -63,7 +63,7 @@ private[sbt] class PluginsDebug(
       val possibleString =
         if (explained.lengthCompare(1) > 0)
           explained.zipWithIndex
-            .map { case (s, i) => s"$i. $s" }
+            .map { (s, i) => s"$i. $s" }
             .mkString(s"Multiple plugins are available that can provide $notFoundKey:\n", "\n", "")
         else
           s"$notFoundKey is provided by an available (but not activated) plugin:\n${explained.mkString}"
diff --git a/main/src/main/scala/sbt/internal/ProjectQuery.scala b/main/src/main/scala/sbt/internal/ProjectQuery.scala
index ce65b5982..655137ba8 100644
--- a/main/src/main/scala/sbt/internal/ProjectQuery.scala
+++ b/main/src/main/scala/sbt/internal/ProjectQuery.scala
@@ -46,7 +46,7 @@ object ProjectQuery:
       token("@scalaBinaryVersion=" ~> StringBasic.map((scalaBinaryVersion.key, _)))
         .examples("@scalaBinaryVersion=3")
         .?)
-      .map { case (proj, params) =>
+      .map { (proj, params) =>
         ProjectQuery(proj, params.toMap)
       }
       .filter(
diff --git a/main/src/main/scala/sbt/internal/SessionSettings.scala b/main/src/main/scala/sbt/internal/SessionSettings.scala
index c3a8003d0..eb5b140f3 100755
--- a/main/src/main/scala/sbt/internal/SessionSettings.scala
+++ b/main/src/main/scala/sbt/internal/SessionSettings.scala
@@ -158,7 +158,7 @@ object SessionSettings:
 
   def removeRanges[T](in: Seq[T], ranges: Seq[(Int, Int)]): Seq[T] = {
     val asSet = ranges.foldLeft(Set.empty[Int]) { case (s, (hi, lo)) => s ++ (hi to lo) }
-    in.zipWithIndex.flatMap { case (t, index) => if (asSet(index + 1)) Nil else t :: Nil }
+    in.zipWithIndex.flatMap { (t, index) => if (asSet(index + 1)) Nil else t :: Nil }
   }
 
   /**
diff --git a/main/src/main/scala/sbt/internal/SettingCompletions.scala b/main/src/main/scala/sbt/internal/SettingCompletions.scala
index 88566501e..0f4157eb1 100644
--- a/main/src/main/scala/sbt/internal/SettingCompletions.scala
+++ b/main/src/main/scala/sbt/internal/SettingCompletions.scala
@@ -143,7 +143,7 @@ private[sbt] object SettingCompletions {
       context: ResolvedProject,
   ): Parser[String] = {
     val keyMap: Map[String, AttributeKey[?]] =
-      rawKeyMap.map { case (k, v) => (keyScalaID(k), v) }.toMap
+      rawKeyMap.map { (k, v) => (keyScalaID(k), v) }.toMap
     val full = for {
       defineKey <- scopedKeyParser(keyMap, settings, context)
       a <- assign(defineKey)
@@ -239,7 +239,7 @@ private[sbt] object SettingCompletions {
     )
     val taskParser =
       axisParser[AttributeKey[?]](_.task, k => keyScalaID(k.label), _.description, "task")
-    val nonGlobal = (configParser ~ taskParser) map { case (c, t) => Scope(This, c, t, Zero) }
+    val nonGlobal = (configParser ~ taskParser) map { (c, t) => Scope(This, c, t, Zero) }
     val global = inParser ~> token((Space ~ GlobalID) ^^^ Global)
     global | nonGlobal
   }
@@ -272,7 +272,7 @@ private[sbt] object SettingCompletions {
 
   /** Produce a new parser that allows the input accepted by `p` to be quoted in backticks. */
   def optionallyQuoted[T](p: Parser[T]): Parser[T] =
-    (Backtick.? ~ p) flatMap { case (quote, id) =>
+    (Backtick.? ~ p) flatMap { (quote, id) =>
       if (quote.isDefined) Backtick.? ^^^ id else success(id)
     }
 
@@ -316,7 +316,7 @@ private[sbt] object SettingCompletions {
       description: T => Option[String]
   )(prominent: (String, T) => Boolean): Seq[Completion] = {
     val applicable = all.toSeq.filter { case (k, _) => k.startsWith(seen) }
-    val prominentOnly = applicable filter { case (k, v) => prominent(k, v) }
+    val prominentOnly = applicable filter { (k, v) => prominent(k, v) }
 
     val showAll = (level >= 3) || (level == 2 && prominentOnly.lengthCompare(
       detailLimit
@@ -331,7 +331,7 @@ private[sbt] object SettingCompletions {
     def appendString(id: String): String = id.stripPrefix(seen) + " "
     if (in.isEmpty) Nil
     else if (showDescriptions) {
-      val withDescriptions = in map { case (id, key) => (id, description(key)) }
+      val withDescriptions = in map { (id, key) => (id, description(key)) }
       val padded = CommandUtil.aligned("", "   ", withDescriptions)
       padded.lazyZip(in).map { case (line, (id, _)) =>
         Completion.tokenDisplay(append = appendString(id), display = line + "\n")
diff --git a/main/src/main/scala/sbt/internal/TaskProgress.scala b/main/src/main/scala/sbt/internal/TaskProgress.scala
index f95c89ca8..e7bd8295a 100644
--- a/main/src/main/scala/sbt/internal/TaskProgress.scala
+++ b/main/src/main/scala/sbt/internal/TaskProgress.scala
@@ -171,7 +171,7 @@ private[sbt] class TaskProgress(
         if (tasks.nonEmpty) nextReport.set(Deadline.now + sleepDuration)
         val toWrite = tasks.sortBy(_._2)
         val distinct = new java.util.LinkedHashMap[String, ProgressItem]
-        toWrite.foreach { case (task, elapsed) =>
+        toWrite.foreach { (task, elapsed) =>
           val name = taskName(task)
           distinct.put(name, ProgressItem(name, elapsed))
         }
diff --git a/main/src/main/scala/sbt/internal/TaskTimings.scala b/main/src/main/scala/sbt/internal/TaskTimings.scala
index 73f7c261f..e405d679c 100644
--- a/main/src/main/scala/sbt/internal/TaskTimings.scala
+++ b/main/src/main/scala/sbt/internal/TaskTimings.scala
@@ -68,14 +68,14 @@ private[sbt] final class TaskTimings(reportOnShutdown: Boolean, logger: Logger)
     val times = timingsByName.toSeq
       .sortBy(_._2.get)
       .reverse
-      .map { case (name, time) =>
+      .map { (name, time) =>
         (if (omitPaths) reFilePath.replaceFirstIn(name, "") else name, divide(time.get))
       }
       .filter { _._2 > threshold }
     if (times.size > 0) {
       val maxTaskNameLength = times.map { _._1.length }.max
       val maxTime = times.map { _._2 }.max.toString.length
-      times.foreach { case (taskName, time) =>
+      times.foreach { (taskName, time) =>
         logger.info(s"  ${taskName.padTo(maxTaskNameLength, ' ')}: ${""
             .padTo(maxTime - time.toString.length, ' ')}$time $unit")
       }
diff --git a/main/src/main/scala/sbt/internal/WatchTransitiveDependencies.scala b/main/src/main/scala/sbt/internal/WatchTransitiveDependencies.scala
index dfe16271e..4a46cfbde 100644
--- a/main/src/main/scala/sbt/internal/WatchTransitiveDependencies.scala
+++ b/main/src/main/scala/sbt/internal/WatchTransitiveDependencies.scala
@@ -70,7 +70,7 @@ private[sbt] object WatchTransitiveDependencies {
       }).toTaskable,
       (scopedKey.scope / internalDependencyConfigurations).toTaskable,
       state,
-    ).mapN { case (log, configs, st) =>
+    ).mapN { (log, configs, st) =>
       new Arguments(
         scopedKey,
         extracted,
@@ -90,7 +90,7 @@ private[sbt] object WatchTransitiveDependencies {
         val rs = Keys.resolvedScoped.value
         (extracted, compiledMap, st, rs)
       }
-      .flatMapTask { case (extracted, compiledMap, st, rs) =>
+      .flatMapTask { (extracted, compiledMap, st, rs) =>
         st.currentCommand.get.commandLine match
           case ShowTransitive(key) =>
             Parser.parse(key.trim, Act.scopedKeyParser(st)) match
@@ -202,7 +202,7 @@ private[sbt] object WatchTransitiveDependencies {
                     .map { task =>
                       val zeroedTaskScope = key.scope.copy(task = Zero)
                       val transitiveKeys = arguments.dependencyConfigurations.flatMap {
-                        case (p, configs) =>
+                        (p, configs) =>
                           configs.map(c =>
                             ScopedKey(zeroedTaskScope.rescope(p).rescope(ConfigKey(c)), task)
                           )
diff --git a/main/src/main/scala/sbt/internal/graph/model.scala b/main/src/main/scala/sbt/internal/graph/model.scala
index ddff82d81..c3e755dbc 100644
--- a/main/src/main/scala/sbt/internal/graph/model.scala
+++ b/main/src/main/scala/sbt/internal/graph/model.scala
@@ -93,7 +93,7 @@ private[sbt] case class ModuleGraph(nodes: Seq[Module], edges: Seq[Edge]) {
     createMap(identity)
 
   lazy val reverseDependencyMap: Map[GraphModuleId, Seq[Module]] =
-    createMap { case (a, b) => (b, a) }
+    createMap { (a, b) => (b, a) }
 
   def createMap(
       bindingFor: ((GraphModuleId, GraphModuleId)) => (GraphModuleId, GraphModuleId)
diff --git a/main/src/main/scala/sbt/internal/graph/rendering/LicenseInfo.scala b/main/src/main/scala/sbt/internal/graph/rendering/LicenseInfo.scala
index 1d9f734fb..8c1f128f0 100644
--- a/main/src/main/scala/sbt/internal/graph/rendering/LicenseInfo.scala
+++ b/main/src/main/scala/sbt/internal/graph/rendering/LicenseInfo.scala
@@ -18,7 +18,7 @@ object LicenseInfo {
       .groupBy(_.license)
       .toSeq
       .sortBy(_._1)
-      .map { case (license, modules) =>
+      .map { (license, modules) =>
         license.getOrElse("No license specified") + "\n" +
           modules.map(m => s"\t ${m.id.idString}").mkString("\n")
       }
diff --git a/main/src/main/scala/sbt/internal/librarymanagement/IvyXml.scala b/main/src/main/scala/sbt/internal/librarymanagement/IvyXml.scala
index 2b7beff73..c2501ba97 100644
--- a/main/src/main/scala/sbt/internal/librarymanagement/IvyXml.scala
+++ b/main/src/main/scala/sbt/internal/librarymanagement/IvyXml.scala
@@ -91,7 +91,7 @@ object IvyXml {
           new PrefixedAttribute("e", k, v, acc)
       }
 
-    val licenseElems = project.info.licenses.map { case (name, urlOpt) =>
+    val licenseElems = project.info.licenses.map { (name, urlOpt) =>
       val n = <license name={name} />
 
       urlOpt.fold(n) { url =>
@@ -133,7 +133,7 @@ object IvyXml {
       .view
       .mapValues { _.map { case (cfg, _) => cfg } }
 
-    val publicationElems = publications.map { case (pub, configs) =>
+    val publicationElems = publications.map { (pub, configs) =>
       val n =
         <artifact name={pub.name} type={pub.`type`.value} ext={pub.ext.value} conf={
           configs.map(_.value).mkString(",")
@@ -145,7 +145,7 @@ object IvyXml {
         n
     }
 
-    val dependencyElems = project.dependencies.toVector.map { case (conf, dep) =>
+    val dependencyElems = project.dependencies.toVector.map { (conf, dep) =>
       val classifier = {
         val pub = dep.publication
         if (pub.classifier.value.nonEmpty)
@@ -160,7 +160,7 @@ object IvyXml {
           Seq.empty
       }
 
-      val excludes = dep.exclusions.toSeq.map { case (org, name) =>
+      val excludes = dep.exclusions.toSeq.map { (org, name) =>
         <exclude org={org.value} module={
           name.value
         } name="*" type="*" ext="*" conf="" matcher="exact"/>
diff --git a/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala b/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala
index 3bae49407..2b7cf22c2 100644
--- a/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala
+++ b/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala
@@ -106,13 +106,13 @@ object BuildServerProtocol {
         val workspace = Keys.bspFullWorkspace.value
         val state = Keys.state.value
         val allTargets = ScopeFilter.in(workspace.scopes.values.toSeq)
-        val sbtTargets = workspace.builds.map { case (buildTargetIdentifier, loadedBuildUnit) =>
+        val sbtTargets = workspace.builds.map { (buildTargetIdentifier, loadedBuildUnit) =>
           val buildFor = workspace.buildToScope.getOrElse(buildTargetIdentifier, Nil)
           sbtBuildTarget(loadedBuildUnit, buildTargetIdentifier, buildFor).result
         }.toList
         (workspace, state, allTargets, sbtTargets)
       }
-      .flatMapTask { case (workspace, state, allTargets, sbtTargets) =>
+      .flatMapTask { (workspace, state, allTargets, sbtTargets) =>
         Def.task {
           val buildTargets = Keys.bspBuildTarget.result.all(allTargets).value
           val successfulBuildTargets = anyOrThrow(buildTargets ++ sbtTargets.join.value)
@@ -124,7 +124,7 @@ object BuildServerProtocol {
     // https://github.com/build-server-protocol/build-server-protocol/blob/master/docs/specification.md#build-target-sources-request
     bspBuildTargetSources := bspInputTask { (workspace, filter) =>
       val items = bspBuildTargetSourcesItem.result.all(filter).value
-      val buildItems = workspace.builds.map { case (id, loadedBuildUnit) =>
+      val buildItems = workspace.builds.map { (id, loadedBuildUnit) =>
         val base = loadedBuildUnit.localBase
         val sbtFiles = configurationSources(base)
         val pluginData = loadedBuildUnit.unit.plugins.pluginData
@@ -223,7 +223,7 @@ object BuildServerProtocol {
       val items = bspBuildTargetJavacOptionsItem.result.all(filter).value
       val appProvider = appConfiguration.value.provider()
       val sbtJars = appProvider.mainClasspath()
-      val buildItems = workspace.builds.map { case (targetId, build) =>
+      val buildItems = workspace.builds.map { (targetId, build) =>
         Result.Value(javacOptionsBuildItem(sbtJars, targetId, build))
       }
       val successfulItems = anyOrThrow(items ++ buildItems)
@@ -669,15 +669,15 @@ object BuildServerProtocol {
         )
       }
       .flatMapTask {
-        case (
-              buildTargetIdentifier,
-              displayName,
-              baseDirectory,
-              tags,
-              capabilities,
-              projectDependencies,
-              compileData
-            ) =>
+        (
+            buildTargetIdentifier,
+            displayName,
+            baseDirectory,
+            tags,
+            capabilities,
+            projectDependencies,
+            compileData
+        ) =>
           Def.task {
             BuildTarget(
               buildTargetIdentifier,
@@ -806,13 +806,13 @@ object BuildServerProtocol {
         )
       }
       .flatMapTask {
-        case (
-              target,
-              scalacOptions,
-              classDirectory,
-              externalDependencyClasspath,
-              internalDependencyClasspath
-            ) =>
+        (
+            target,
+            scalacOptions,
+            classDirectory,
+            externalDependencyClasspath,
+            internalDependencyClasspath
+        ) =>
           Def.task {
             val converter = fileConverter.value
             val cp0 = internalDependencyClasspath.join.value.distinct ++
@@ -893,7 +893,7 @@ object BuildServerProtocol {
               )
             case Success(value) =>
               value.withEnvironmentVariables(
-                envVars.value.map { case (k, v) => s"$k=$v" }.toVector ++ value.environmentVariables
+                envVars.value.map { (k, v) => s"$k=$v" }.toVector ++ value.environmentVariables
               )
           }
 
@@ -913,7 +913,7 @@ object BuildServerProtocol {
             ),
             runParams.arguments,
             defaultJvmOptions.toVector,
-            envVars.value.map { case (k, v) => s"$k=$v" }.toVector
+            envVars.value.map { (k, v) => s"$k=$v" }.toVector
           )
       }
       runMainClassTask(mainClass, runParams.originId)
@@ -1000,7 +1000,7 @@ object BuildServerProtocol {
   private def internalDependencyConfigurationsSetting = Def.settingDyn {
     val allScopes = bspFullWorkspace.value.scopes.map { case (_, scope) => scope }.toSet
     val directDependencies = Keys.internalDependencyConfigurations.value
-      .map { case (project, rawConfigs) =>
+      .map { (project, rawConfigs) =>
         val configs = rawConfigs
           .flatMap(_.split(","))
           .map(name => ConfigKey(name.trim))
@@ -1042,7 +1042,7 @@ object BuildServerProtocol {
 
         val grouped = TestFramework.testMap(frameworks, definitions)
 
-        grouped.map { case (framework, definitions) =>
+        grouped.map { (framework, definitions) =>
           ScalaTestClassesItem(
             bspTargetIdentifier.value,
             definitions.map(_.name).toVector,
@@ -1059,7 +1059,7 @@ object BuildServerProtocol {
         _,
         Vector(),
         jvmOptions,
-        envVars.value.map { case (k, v) => s"$k=$v" }.toVector
+        envVars.value.map { (k, v) => s"$k=$v" }.toVector
       )
     )
     ScalaMainClassesItem(
diff --git a/main/src/main/scala/sbt/internal/server/Definition.scala b/main/src/main/scala/sbt/internal/server/Definition.scala
index 2fa19c3cf..02d8cb6a8 100644
--- a/main/src/main/scala/sbt/internal/server/Definition.scala
+++ b/main/src/main/scala/sbt/internal/server/Definition.scala
@@ -70,7 +70,7 @@ private[sbt] object Definition {
       val whiteSpaceReg = "(\\s|\\.)+".r
 
       val (zero, end) = fold(Seq.empty)(whiteSpaceReg.findAllIn(line))
-        .collect { case (white, ind) =>
+        .collect { (white, ind) =>
           (ind, ind + white.length)
         }
         .fold((0, line.length)) { case ((left, right), (from, to)) =>
@@ -85,7 +85,7 @@ private[sbt] object Definition {
       } yield (from -> to)
 
       ranges
-        .sortBy { case (from, to) => -(to - from) }
+        .sortBy { (from, to) => -(to - from) }
         .foldLeft(List.empty[String]) { case (z, (from, to)) =>
           val fragment = line.slice(from, to).trim
           if (isIdentifier(fragment))
@@ -134,7 +134,7 @@ private[sbt] object Definition {
         .flatMap { reg =>
           fold(Seq.empty)(reg.findAllIn(line))
         }
-        .collect { case (name, pos) =>
+        .collect { (name, pos) =>
           (if (name.endsWith("[")) name.init.trim else name.trim) -> pos
         }
     }
@@ -146,9 +146,9 @@ private[sbt] object Definition {
         .iterator
         .asScala
         .zipWithIndex
-        .flatMap { case (line, lineNumber) =>
+        .flatMap { (line, lineNumber) =>
           findInLine(line)
-            .collect { case (sym, from) =>
+            .collect { (sym, from) =>
               (file.toUri, lineNumber.toLong, from.toLong, from.toLong + sym.length)
             }
         }
@@ -294,7 +294,7 @@ private[sbt] object Definition {
                 }
                 .flatMap { (classFile: VirtualFileRef) =>
                   val x = converter.toPath(classFile)
-                  textProcessor.markPosition(x, sym).collect { case (uri, line, from, to) =>
+                  textProcessor.markPosition(x, sym).collect { (uri, line, from, to) =>
                     Location(
                       uri.toString,
                       Range(Position(line, from), Position(line, to)),
diff --git a/main/src/main/scala/sbt/internal/server/NetworkChannel.scala b/main/src/main/scala/sbt/internal/server/NetworkChannel.scala
index 0456b13e5..e195ffa0a 100644
--- a/main/src/main/scala/sbt/internal/server/NetworkChannel.scala
+++ b/main/src/main/scala/sbt/internal/server/NetworkChannel.scala
@@ -200,16 +200,16 @@ final class NetworkChannel(
     }
 
     lazy val onRequestMessage: PartialFunction[JsonRpcRequestMessage, Unit] =
-      intents.foldLeft(PartialFunction.empty[JsonRpcRequestMessage, Unit]) { case (f, i) =>
+      intents.foldLeft(PartialFunction.empty[JsonRpcRequestMessage, Unit]) { (f, i) =>
         f orElse i.onRequest
       }
     lazy val onResponseMessage: PartialFunction[JsonRpcResponseMessage, Unit] =
-      intents.foldLeft(PartialFunction.empty[JsonRpcResponseMessage, Unit]) { case (f, i) =>
+      intents.foldLeft(PartialFunction.empty[JsonRpcResponseMessage, Unit]) { (f, i) =>
         f orElse i.onResponse
       }
 
     lazy val onNotification: PartialFunction[JsonRpcNotificationMessage, Unit] =
-      intents.foldLeft(PartialFunction.empty[JsonRpcNotificationMessage, Unit]) { case (f, i) =>
+      intents.foldLeft(PartialFunction.empty[JsonRpcNotificationMessage, Unit]) { (f, i) =>
         f orElse i.onNotification
       }
 
diff --git a/main/src/main/scala/sbt/nio/FileStamp.scala b/main/src/main/scala/sbt/nio/FileStamp.scala
index 055ca86eb..b55c84375 100644
--- a/main/src/main/scala/sbt/nio/FileStamp.scala
+++ b/main/src/main/scala/sbt/nio/FileStamp.scala
@@ -185,7 +185,7 @@ object FileStamp {
       new JsonFormat[Seq[(Path, Hash)]] {
         override def write[J](obj: Seq[(Path, Hash)], builder: Builder[J]): Unit = {
           builder.beginArray()
-          obj.foreach { case (p, h) =>
+          obj.foreach { (p, h) =>
             builder.beginArray()
             builder.writeString(p.toString)
             builder.writeString(h.hex)
@@ -215,7 +215,7 @@ object FileStamp {
       new JsonFormat[Seq[(Path, LastModified)]] {
         override def write[J](obj: Seq[(Path, LastModified)], builder: Builder[J]): Unit = {
           builder.beginArray()
-          obj.foreach { case (p, lm) =>
+          obj.foreach { (p, lm) =>
             builder.beginArray()
             builder.writeString(p.toString)
             builder.writeLong(lm.time)
diff --git a/main/src/main/scala/sbt/nio/Settings.scala b/main/src/main/scala/sbt/nio/Settings.scala
index 6d1c451b0..f4f1b2672 100644
--- a/main/src/main/scala/sbt/nio/Settings.scala
+++ b/main/src/main/scala/sbt/nio/Settings.scala
@@ -232,8 +232,10 @@ private[sbt] object Settings {
     val unmodifiedBuilder = new VectorBuilder[Path]
     val seen = ConcurrentHashMap.newKeySet[Path]
     val prevMap = new ConcurrentHashMap[Path, FileStamp]()
-    previous.foreach { case (k, v) => prevMap.put(k, v); () }
-    current.foreach { case (path, currentStamp) =>
+    previous.foreach { (k, v) =>
+      prevMap.put(k, v); ()
+    }
+    current.foreach { (path, currentStamp) =>
       if (seen.add(path)) {
         prevMap.remove(path) match {
           case null => createdBuilder += path
diff --git a/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala b/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala
index f47f30bad..93c8065bd 100644
--- a/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala
+++ b/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala
@@ -154,7 +154,7 @@ object DependencyTreeSettings {
         output
       },
     ) ++
-      renderingAlternatives.flatMap { case (key, renderer) => renderingTaskSettings(key, renderer) }
+      renderingAlternatives.flatMap { (key, renderer) => renderingTaskSettings(key, renderer) }
 
   def renderingAlternatives: Seq[(TaskKey[Unit], ModuleGraph => String)] =
     Seq(
diff --git a/main/src/test/scala/sbt/internal/TestBuild.scala b/main/src/test/scala/sbt/internal/TestBuild.scala
index 5e528a3ea..8389d950e 100644
--- a/main/src/test/scala/sbt/internal/TestBuild.scala
+++ b/main/src/test/scala/sbt/internal/TestBuild.scala
@@ -158,7 +158,7 @@ abstract class TestBuild {
       )
     lazy val allFullScopes: Seq[Scope] =
       for {
-        (ref, p) <- (Zero, root.root) +: allProjects.map { case (ref, p) => (Select(ref), p) }
+        (ref, p) <- (Zero, root.root) +: allProjects.map { (ref, p) => (Select(ref), p) }
         t <- Zero +: tasks.map(t => Select(t.key))
         c <- Zero +: p.configurations.map(c => Select(ConfigKey(c.name)))
       } yield Scope(project = ref, config = c, task = t, extra = Zero)
@@ -353,7 +353,7 @@ abstract class TestBuild {
       make: T => Gen[Vector[A] => A]
   ): Gen[Vector[A]] =
     genAcyclic(maxDeps, keys, Vector()) flatMap { pairs =>
-      sequence(pairs.map { case (key, deps) => mapMake(key, deps, make) }.toList) map { inputs =>
+      sequence(pairs.map { (key, deps) => mapMake(key, deps, make) }.toList) map { inputs =>
         val made = new collection.mutable.HashMap[T, A]
         for ((key, deps, mk) <- inputs)
           made(key) = mk(deps map made)
diff --git a/run/src/main/scala/sbt/Fork.scala b/run/src/main/scala/sbt/Fork.scala
index 40d640e13..d57d4f20b 100644
--- a/run/src/main/scala/sbt/Fork.scala
+++ b/run/src/main/scala/sbt/Fork.scala
@@ -67,7 +67,7 @@ final class Fork(val commandName: String, val runnerClass: Option[String]) {
       else
         new JProcessBuilder(command*)
     workingDirectory.foreach(jpb.directory(_))
-    environment.foreach { case (k, v) => jpb.environment.put(k, v) }
+    environment.foreach { (k, v) => jpb.environment.put(k, v) }
     if (connectInput) {
       jpb.redirectInput(Redirect.INHERIT)
       ()
diff --git a/run/src/main/scala/sbt/SelectMainClass.scala b/run/src/main/scala/sbt/SelectMainClass.scala
index c4865f6c7..68aea5049 100644
--- a/run/src/main/scala/sbt/SelectMainClass.scala
+++ b/run/src/main/scala/sbt/SelectMainClass.scala
@@ -26,7 +26,7 @@ object SelectMainClass {
           @tailrec def loop(): Option[String] = {
             val header = "\nMultiple main classes detected. Select one to run:\n"
             val classes = multiple.zipWithIndex
-              .map { case (className, index) => s" [${index + 1}] $className" }
+              .map { (className, index) => s" [${index + 1}] $className" }
               .mkString("\n")
             println(ClearScreenAfterCursor + header + classes + "\n")
             val line = trim(prompt("Enter number: "))
diff --git a/sbt-remote-cache/src/main/scala/sbt/internal/GrpcActionCacheStore.scala b/sbt-remote-cache/src/main/scala/sbt/internal/GrpcActionCacheStore.scala
index 3fea5caff..53a47412b 100644
--- a/sbt-remote-cache/src/main/scala/sbt/internal/GrpcActionCacheStore.scala
+++ b/sbt-remote-cache/src/main/scala/sbt/internal/GrpcActionCacheStore.scala
@@ -96,7 +96,7 @@ object GrpcActionCacheStore:
       executor.execute: () =>
         try
           val headers = Metadata()
-          pairs.foreach { case (k, v) =>
+          pairs.foreach { (k, v) =>
             headers.put(k, v)
           }
           applier.apply(headers)
diff --git a/scripted-sbt/src/main/scala/sbt/scriptedtest/ScriptedTests.scala b/scripted-sbt/src/main/scala/sbt/scriptedtest/ScriptedTests.scala
index 8829f8ea3..e9c95a4fd 100644
--- a/scripted-sbt/src/main/scala/sbt/scriptedtest/ScriptedTests.scala
+++ b/scripted-sbt/src/main/scala/sbt/scriptedtest/ScriptedTests.scala
@@ -122,7 +122,7 @@ final class ScriptedTests(
 
     type TestInfo = ((String, String), File)
 
-    val labelsAndDirs = groupAndNameDirs.filterNot(_._2.isFile).map { case (groupDir, nameDir) =>
+    val labelsAndDirs = groupAndNameDirs.filterNot(_._2.isFile).map { (groupDir, nameDir) =>
       val groupName = groupDir.getName
       val testName = nameDir.getName
       val testDirectory = testResources.readOnlyResourceDirectory(groupName, testName)
diff --git a/tasks-standard/src/main/scala/sbt/Task.scala b/tasks-standard/src/main/scala/sbt/Task.scala
index cbe2628d5..abcedf5af 100644
--- a/tasks-standard/src/main/scala/sbt/Task.scala
+++ b/tasks-standard/src/main/scala/sbt/Task.scala
@@ -64,7 +64,7 @@ object Task:
     override def pure[A1](a: () => A1): Task[A1] = toTask(a)
 
     override def ap[A1, A2](ff: Task[A1 => A2])(in: Task[A1]): Task[A2] =
-      multT2Task((in, ff)).mapN { case (x, f) =>
+      multT2Task((in, ff)).mapN { (x, f) =>
         f(x)
       }
 
diff --git a/tasks-standard/src/test/scala/Test.scala b/tasks-standard/src/test/scala/Test.scala
index e5f9ceb12..b4f2fffca 100644
--- a/tasks-standard/src/test/scala/Test.scala
+++ b/tasks-standard/src/test/scala/Test.scala
@@ -19,8 +19,8 @@ object Test extends std.TaskExtra:
   val b2 = task(true)
   val c = task("asdf")
 
-  val h1 = t3(a, b, c).mapN { case (aa, bb, cc) => s"$aa $bb $cc" }
-  val h2 = t3(a, b2, c).mapN { case (aa, bb, cc) => s"$aa $bb $cc" }
+  val h1 = t3(a, b, c).mapN { (aa, bb, cc) => s"$aa $bb $cc" }
+  val h2 = t3(a, b2, c).mapN { (aa, bb, cc) => s"$aa $bb $cc" }
 
   type Values = (Result[Int], Result[Boolean], Result[String])
 
diff --git a/tasks-standard/src/test/scala/TestRunnerSort.scala b/tasks-standard/src/test/scala/TestRunnerSort.scala
index c3a89c308..7d9c96b8d 100644
--- a/tasks-standard/src/test/scala/TestRunnerSort.scala
+++ b/tasks-standard/src/test/scala/TestRunnerSort.scala
@@ -37,7 +37,7 @@ object TaskRunnerSortTest extends Properties("TaskRunnerSort") {
       task(a) flatMap { a =>
         val pivot = a(0)
         val (lt, gte) = a.view.drop(1).partition(_ < pivot)
-        sbt.Test.t2(sort(lt.toSeq), sort(gte.toSeq)) mapN { case (l, g) =>
+        sbt.Test.t2(sort(lt.toSeq), sort(gte.toSeq)) mapN { (l, g) =>
           l ++ List(pivot) ++ g
         }
       }
diff --git a/tasks/src/main/scala/sbt/Execute.scala b/tasks/src/main/scala/sbt/Execute.scala
index 2fd1eef7a..f1a6a22f2 100644
--- a/tasks/src/main/scala/sbt/Execute.scala
+++ b/tasks/src/main/scala/sbt/Execute.scala
@@ -384,7 +384,7 @@ private[sbt] final class Execute(
   // cyclic reference checking
 
   def snapshotCycleCheck(): Unit =
-    callers.toSeq foreach { case (called, callers) =>
+    callers.toSeq foreach { (called, callers) =>
       for (caller <- callers) cycleCheck(caller, called)
     }
 
diff --git a/testing/src/main/scala/sbt/TestFramework.scala b/testing/src/main/scala/sbt/TestFramework.scala
index 396e137f8..ef7d80a3e 100644
--- a/testing/src/main/scala/sbt/TestFramework.scala
+++ b/testing/src/main/scala/sbt/TestFramework.scala
@@ -229,7 +229,7 @@ object TestFramework {
     else
       createTestTasks(
         testLoader,
-        runners.map { case (tf, r) =>
+        runners.map { (tf, r) =>
           (frameworks(tf), new TestRunner(r, listeners, log))
         },
         mappedTests,
@@ -283,7 +283,7 @@ object TestFramework {
 
     val startTask = foreachListenerSafe(_.doInit())
     val testTasks =
-      Map(tests.toSeq.flatMap { case (framework, testDefinitions) =>
+      Map(tests.toSeq.flatMap { (framework, testDefinitions) =>
         val runner = runners(framework)
         val testTasks = withContextLoader(loader) { runner.tasks(testDefinitions) }
         for (testTask <- testTasks) yield {
diff --git a/util-cache/src/test/scala/CacheSpec.scala b/util-cache/src/test/scala/CacheSpec.scala
index 8b4523cf8..7a0e97bc0 100644
--- a/util-cache/src/test/scala/CacheSpec.scala
+++ b/util-cache/src/test/scala/CacheSpec.scala
@@ -18,7 +18,7 @@ import org.scalatest.flatspec.AnyFlatSpec
 class CacheSpec extends AnyFlatSpec {
 
   "A cache" should "NOT throw an exception if read without being written previously" in {
-    testCache[String, Int] { case (cache, store) =>
+    testCache[String, Int] { (cache, store) =>
       cache(store)("missing") match {
         case Hit(_)  => fail()
         case Miss(_) => ()
@@ -27,7 +27,7 @@ class CacheSpec extends AnyFlatSpec {
   }
 
   it should "write a very simple value" in {
-    testCache[String, Int] { case (cache, store) =>
+    testCache[String, Int] { (cache, store) =>
       cache(store)("missing") match {
         case Hit(_)       => fail()
         case Miss(update) => update(5)
@@ -36,7 +36,7 @@ class CacheSpec extends AnyFlatSpec {
   }
 
   it should "be updatable" in {
-    testCache[String, Int] { case (cache, store) =>
+    testCache[String, Int] { (cache, store) =>
       val value = 5
       cache(store)("someKey") match {
         case Hit(_)       => fail()
@@ -51,7 +51,7 @@ class CacheSpec extends AnyFlatSpec {
   }
 
   it should "return the value that has been previously written" in {
-    testCache[String, Int] { case (cache, store) =>
+    testCache[String, Int] { (cache, store) =>
       val key = "someKey"
       val value = 5
       cache(store)(key) match {
diff --git a/util-cache/src/test/scala/SingletonCacheSpec.scala b/util-cache/src/test/scala/SingletonCacheSpec.scala
index a83aee69d..de8745dc0 100644
--- a/util-cache/src/test/scala/SingletonCacheSpec.scala
+++ b/util-cache/src/test/scala/SingletonCacheSpec.scala
@@ -48,7 +48,7 @@ class SingletonCacheSpec extends AnyFlatSpec {
   }
 
   "A singleton cache" should "throw an exception if read without being written previously" in {
-    testCache[Int] { case (cache, store) =>
+    testCache[Int] { (cache, store) =>
       intercept[Exception] {
         cache.read(store)
       }
@@ -57,13 +57,13 @@ class SingletonCacheSpec extends AnyFlatSpec {
   }
 
   it should "write a very simple value" in {
-    testCache[Int] { case (cache, store) =>
+    testCache[Int] { (cache, store) =>
       cache.write(store, 5)
     }
   }
 
   it should "return the simple value that has been previously written" in {
-    testCache[Int] { case (cache, store) =>
+    testCache[Int] { (cache, store) =>
       val value = 5
       cache.write(store, value)
       val read = cache.read(store)
@@ -73,7 +73,7 @@ class SingletonCacheSpec extends AnyFlatSpec {
   }
 
   it should "write a complex value" in {
-    testCache[ComplexType] { case (cache, store) =>
+    testCache[ComplexType] { (cache, store) =>
       val value = ComplexType(1, "hello, world!", (1 to 10 by 3).toList)
       cache.write(store, value)
       val read = cache.read(store)
diff --git a/util-cache/src/test/scala/sbt/util/ActionCacheTest.scala b/util-cache/src/test/scala/sbt/util/ActionCacheTest.scala
index 2dc77ddd5..ef25ed777 100644
--- a/util-cache/src/test/scala/sbt/util/ActionCacheTest.scala
+++ b/util-cache/src/test/scala/sbt/util/ActionCacheTest.scala
@@ -36,7 +36,7 @@ object ActionCacheTest extends BasicTestSuite:
   def testActionCacheBasic(cache: ActionCacheStore): Unit =
     import sjsonnew.BasicJsonProtocol.*
     var called = 0
-    val action: ((Int, Int)) => InternalActionResult[Int] = { case (a, b) =>
+    val action: ((Int, Int)) => InternalActionResult[Int] = { (a, b) =>
       called += 1
       InternalActionResult(a + b, Nil)
     }
@@ -58,7 +58,7 @@ object ActionCacheTest extends BasicTestSuite:
     import sjsonnew.BasicJsonProtocol.*
     IO.withTemporaryDirectory: (tempDir) =>
       var called = 0
-      val action: ((Int, Int)) => InternalActionResult[Int] = { case (a, b) =>
+      val action: ((Int, Int)) => InternalActionResult[Int] = { (a, b) =>
         called += 1
         val out = StringVirtualFile1(s"$tempDir/a.txt", (a + b).toString)
         InternalActionResult(a + b, Seq(out))
diff --git a/util-collection/src/main/scala/sbt/internal/util/INode.scala b/util-collection/src/main/scala/sbt/internal/util/INode.scala
index 68ec10137..0f9579009 100644
--- a/util-collection/src/main/scala/sbt/internal/util/INode.scala
+++ b/util-collection/src/main/scala/sbt/internal/util/INode.scala
@@ -120,7 +120,7 @@ class EvaluateSettings[I <: Init](
 
     private def keyString =
       static.toSeq
-        .flatMap { case (key, value) =>
+        .flatMap { (key, value) =>
           if (value eq this) init.showFullKey.show(key) :: Nil else Nil
         }
         .headOption
diff --git a/util-collection/src/main/scala/sbt/internal/util/PMap.scala b/util-collection/src/main/scala/sbt/internal/util/PMap.scala
index f37e39a99..7622dec7f 100644
--- a/util-collection/src/main/scala/sbt/internal/util/PMap.scala
+++ b/util-collection/src/main/scala/sbt/internal/util/PMap.scala
@@ -75,7 +75,7 @@ object IMap {
       put(k, f(this.get(k).getOrElse(init)))
 
     def mapValues[V2[_]](f: [A] => V[A] => V2[A]) =
-      new IMap0[K, V2](Map(backing.iterator.map { case (k, v) =>
+      new IMap0[K, V2](Map(backing.iterator.map { (k, v) =>
         k -> f(v)
       }.toArray*))
 
diff --git a/util-collection/src/main/scala/sbt/internal/util/Settings.scala b/util-collection/src/main/scala/sbt/internal/util/Settings.scala
index c05288e60..08d6dfdbe 100644
--- a/util-collection/src/main/scala/sbt/internal/util/Settings.scala
+++ b/util-collection/src/main/scala/sbt/internal/util/Settings.scala
@@ -246,7 +246,7 @@ trait Init:
       case m: IMap.IMap0[ScopedKey, SettingSeq] @unchecked =>
         import scala.collection.parallel.CollectionConverters.*
         m.backing.par
-          .map { case (k, ss) =>
+          .map { (k, ss) =>
             val deps = ss.iterator.flatMap(_.dependencies).toSet
             k -> Compiled(k.asInstanceOf[ScopedKey[Any]], deps, ss.asInstanceOf[SettingSeq[Any]])
           }
@@ -292,7 +292,7 @@ trait Init:
     val undefined = new java.util.ArrayList[Undefined]
     val result = new java.util.concurrent.ConcurrentHashMap[ScopedKey[?], Any]
     val backing = sMap.toSeq
-    Par(backing).foreach { case (key, settings) =>
+    Par(backing).foreach { (key, settings) =>
       val valid = new java.util.ArrayList[Setting[?]]
       val undefs = new java.util.ArrayList[Undefined]
       def validate(s: Setting[?], first: Boolean): Unit = {