diff --git a/internal/util-logic/src/main/scala/sbt/internal/util/logic/Logic.scala b/internal/util-logic/src/main/scala/sbt/internal/util/logic/Logic.scala index 25ea70856..aadb88c83 100644 --- a/internal/util-logic/src/main/scala/sbt/internal/util/logic/Logic.scala +++ b/internal/util-logic/src/main/scala/sbt/internal/util/logic/Logic.scala @@ -236,7 +236,7 @@ object Logic { } private def keepPositive(lits: Set[Literal]): Set[Atom] = - lits.collect { case a: Atom => a }.toSet + lits.collect { case a: Atom => a } // precondition: factsToProcess contains no contradictions @tailrec private def reduce0( diff --git a/lm-coursier/src/main/scala/lmcoursier/internal/SbtUpdateReport.scala b/lm-coursier/src/main/scala/lmcoursier/internal/SbtUpdateReport.scala index e07416964..1dcb31f63 100644 --- a/lm-coursier/src/main/scala/lmcoursier/internal/SbtUpdateReport.scala +++ b/lm-coursier/src/main/scala/lmcoursier/internal/SbtUpdateReport.scala @@ -154,7 +154,7 @@ private[internal] object SbtUpdateReport { val deps = classifiersOpt match { case Some(classifiers) => - res.dependencyArtifacts(Some(classifiers.toSeq), classpathOrder) + res.dependencyArtifacts(Some(classifiers), classpathOrder) case None => res.dependencyArtifacts(None, classpathOrder) } 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 de657f97d..71a477b1e 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 @@ -220,7 +220,7 @@ private[sbt] class CachedResolutionResolveCache { else if (dynamicGraphPath.exists) Some(dynamicGraphPath) else None) match { case Some(path) => - log.debug(s"parsing ${path.getAbsolutePath.toString}") + log.debug(s"parsing ${path.getAbsolutePath}") val ur = JsonUtil.parseUpdateReport(path, cachedDescriptor, log) if (ur.allFiles forall { _.exists }) { updateReportCache(md.getModuleRevisionId) = Right(ur) @@ -568,7 +568,7 @@ private[sbt] trait CachedResolutionResolveEngine extends ResolveEngine { ): Vector[OrganizationArtifactReport] = { // filter out evicted modules from further logic def filterReports(report0: OrganizationArtifactReport): Option[OrganizationArtifactReport] = - report0.modules.toVector flatMap { mr => + report0.modules flatMap { mr => if (mr.evicted || mr.problem.nonEmpty) None else // https://github.com/sbt/sbt/issues/1763 @@ -980,7 +980,7 @@ private[sbt] trait CachedResolutionResolveEngine extends ResolveEngine { } // These are the configurations from the original project we want to resolve. val rootModuleConfs = md0.getConfigurations.toVector - val configurations0: Vector[ConfigurationReport] = ur.configurations.toVector + val configurations0: Vector[ConfigurationReport] = ur.configurations // This is how md looks from md0 via dd's mapping. val remappedConfigs0: Map[String, Vector[String]] = Map(rootModuleConfs map { conf0 => val remapped: Vector[String] = dd diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 3396cfcb1..e9dd6b511 100644 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -3703,7 +3703,7 @@ object Classpaths { // https://github.com/sbt/sbt/issues/4408 val xs = (explicit, boot) match { case (Some(ex), Some(b)) => (ex.toVector ++ b.toVector).distinct - case (Some(ex), None) => ex.toVector + case (Some(ex), None) => ex case (None, Some(b)) => b.toVector case _ => Vector() } diff --git a/main/src/main/scala/sbt/ProjectMatrix.scala b/main/src/main/scala/sbt/ProjectMatrix.scala index b6a894ecc..d4d172d1e 100644 --- a/main/src/main/scala/sbt/ProjectMatrix.scala +++ b/main/src/main/scala/sbt/ProjectMatrix.scala @@ -592,7 +592,7 @@ object ProjectMatrix { jsPlatform(scalaVersions, Nil) override def defaultAxes(axes: VirtualAxis*): ProjectMatrix = - copy(defAxes = axes.toSeq) + copy(defAxes = axes) def scalajsPlugin: Try[AutoPlugin] = { import ReflectionUtil.* @@ -775,7 +775,7 @@ object ProjectMatrix { customRow(autoScalaLibrary, crossVersion = None, scalaVersions, axisValues)(process) override def finder(axisValues: VirtualAxis*): ProjectFinder = - new AxisBaseProjectFinder(axisValues.toSeq) + new AxisBaseProjectFinder(axisValues) override def allProjects(): Seq[(Project, Seq[VirtualAxis])] = resolvedMappings.map { (row, project) => diff --git a/main/src/main/scala/sbt/internal/KeyIndex.scala b/main/src/main/scala/sbt/internal/KeyIndex.scala index 1af1edb66..1af73f4af 100644 --- a/main/src/main/scala/sbt/internal/KeyIndex.scala +++ b/main/src/main/scala/sbt/internal/KeyIndex.scala @@ -138,8 +138,8 @@ private[sbt] final class AKeyIndex(val data: Relation[Option[AttributeKey[?]], S def add(task: Option[AttributeKey[?]], key: AttributeKey[?]): AKeyIndex = new AKeyIndex(data + (task, key.label)) def keys(task: Option[AttributeKey[?]]): Set[String] = data.forward(task) - def allKeys: Set[String] = data._2s.toSet - def tasks: Set[AttributeKey[?]] = data._1s.flatten.toSet + def allKeys: Set[String] = data._2s + def tasks: Set[AttributeKey[?]] = data._1s.flatten def tasks(key: String): Set[AttributeKey[?]] = data.reverse(key).flatten } diff --git a/main/src/main/scala/sbt/internal/LibraryManagement.scala b/main/src/main/scala/sbt/internal/LibraryManagement.scala index 514e1c629..dd1e601a4 100644 --- a/main/src/main/scala/sbt/internal/LibraryManagement.scala +++ b/main/src/main/scala/sbt/internal/LibraryManagement.scala @@ -756,7 +756,7 @@ private[sbt] object LibraryManagement { val tmpFile = File.createTempFile("checksum", suffix) IO.write(tmpFile, content) (tmpFile, suffix) - }.toVector + } artifacts.foreach { case (artifact, sourceFile) => val folder = typeToFolder(artifact.`type`) @@ -903,7 +903,6 @@ private[sbt] object LibraryManagement { val tmpFile = File.createTempFile("checksum", suffix) IO.write(tmpFile, content) (tmpFile, suffix) - .toVector val base = baseUrl.stripSuffix("/") + "/" artifacts.foreach: diff --git a/main/src/main/scala/sbt/internal/librarymanagement/DependencyLockManager.scala b/main/src/main/scala/sbt/internal/librarymanagement/DependencyLockManager.scala index a6c574e58..7c7a44cbc 100644 --- a/main/src/main/scala/sbt/internal/librarymanagement/DependencyLockManager.scala +++ b/main/src/main/scala/sbt/internal/librarymanagement/DependencyLockManager.scala @@ -86,7 +86,7 @@ object DependencyLockManager: extension = artifact.extension, tpe = artifact.`type` ) - }.toVector + } DependencyLock( organization = moduleReport.module.organization, @@ -98,13 +98,13 @@ object DependencyLockManager: transitives = Vector.empty, artifacts = artifacts ) - }.toVector + } ConfigurationLock( name = configReport.configuration.name, dependencies = deps ) - }.toVector + } val metadata = LockFileMetadata( sbtVersion = sbtVersion, diff --git a/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala b/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala index e515dd9d4..29043daa2 100644 --- a/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala +++ b/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala @@ -242,7 +242,7 @@ object BuildServerProtocol { workspace.warnIfBuildsNonEmpty(Method.ScalaTestClasses, s.log) val items = bspScalaTestClassesItem.result.all(filter).value val successfulItems = anyOrThrow(items).flatten.toVector - val result = ScalaTestClassesResult(successfulItems.toVector, None) + val result = ScalaTestClassesResult(successfulItems, None) s.respondEvent(result) }.evaluated, bspBuildTargetJVMRunEnvironment / aggregate := false, diff --git a/sbtw/src/main/scala/sbtw/ConfigLoader.scala b/sbtw/src/main/scala/sbtw/ConfigLoader.scala index f814ab064..d67b6213e 100644 --- a/sbtw/src/main/scala/sbtw/ConfigLoader.scala +++ b/sbtw/src/main/scala/sbtw/ConfigLoader.scala @@ -27,7 +27,7 @@ object ConfigLoader: val fromConfigLines = loadLines(fromConfig) val fromEtcLines = loadLines(fromEtc) val fromSbtConfigLines = loadLines(fromSbtConfig) - (fromEtcLines ++ fromConfigLines ++ fromSbtConfigLines ++ fromEnv ++ fromProjectLines).toSeq + (fromEtcLines ++ fromConfigLines ++ fromSbtConfigLines ++ fromEnv ++ fromProjectLines) def loadJvmOpts(cwd: File): Seq[String] = val fromProject = new File(cwd, ".jvmopts")