From 3d6286edc21decb4140c70bd3a52bb70fd26cbee Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Wed, 1 Jan 2025 15:47:55 +0900 Subject: [PATCH] remove unnecessary vararg splice --- .../scala/sbt/librarymanagement/ConfigurationExtra.scala | 7 +------ .../scala/sbt/internal/librarymanagement/MakePom.scala | 2 +- .../ivyint/CachedResolutionResolveEngine.scala | 2 +- main/src/main/scala/sbt/internal/IncrementalTest.scala | 5 ++--- main/src/main/scala/sbt/internal/ProjectQuery.scala | 2 +- run/src/main/scala/sbt/Fork.scala | 2 +- 6 files changed, 7 insertions(+), 13 deletions(-) diff --git a/lm-core/src/main/scala/sbt/librarymanagement/ConfigurationExtra.scala b/lm-core/src/main/scala/sbt/librarymanagement/ConfigurationExtra.scala index 0a3ff2300..0184efb4b 100644 --- a/lm-core/src/main/scala/sbt/librarymanagement/ConfigurationExtra.scala +++ b/lm-core/src/main/scala/sbt/librarymanagement/ConfigurationExtra.scala @@ -64,12 +64,7 @@ object Configurations { private[sbt] def defaultConfiguration(mavenStyle: Boolean) = if (mavenStyle) Configurations.Compile else Configurations.Default private[sbt] def removeDuplicates(configs: Iterable[Configuration]) = - Set( - scala.collection.mutable - .Map(configs.map(config => (config.name, config)).toSeq*) - .values - .toList* - ) + configs.map(config => (config.name, config)).toMap.values.toSet /** Returns true if the configuration should be under the influence of scalaVersion. */ @nowarn diff --git a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/MakePom.scala b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/MakePom.scala index 97354df58..71c510feb 100644 --- a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/MakePom.scala +++ b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/MakePom.scala @@ -437,7 +437,7 @@ class MakePom(val log: Logger) { configurations: Option[Iterable[Configuration]] ): Seq[DependencyDescriptor] = { val keepConfigurations = IvySbt.getConfigurations(module, configurations) - val keepSet: Set[String] = Set(keepConfigurations.toSeq*) + val keepSet: Set[String] = keepConfigurations.toSet def translate(dependency: DependencyDescriptor) = { val keep = dependency.getModuleConfigurations .filter((conf: String) => keepSet.contains(conf)) 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 c3b414ef5..aedd08d83 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 @@ -625,7 +625,7 @@ private[sbt] trait CachedResolutionResolveEngine extends ResolveEngine { loopLists.toList } val allModules2: mutable.Map[(String, String), Vector[OrganizationArtifactReport]] = - mutable.Map(allModules0.toSeq*) + allModules0.to(mutable.Map) @tailrec def breakLoops(loops: List[List[(String, String)]]): Unit = loops match { case Nil => () diff --git a/main/src/main/scala/sbt/internal/IncrementalTest.scala b/main/src/main/scala/sbt/internal/IncrementalTest.scala index d0e20fa26..281ae9247 100644 --- a/main/src/main/scala/sbt/internal/IncrementalTest.scala +++ b/main/src/main/scala/sbt/internal/IncrementalTest.scala @@ -205,9 +205,8 @@ class ClassStamper( // .get(prodClassName) // .map: analyzed => // 0L // analyzed.??? we need a hash here - val xs = SortedSet( - (internalDeps union internalJarDeps union externalDeps union classDigests).toSeq* - ) + val xs = + (internalDeps union internalJarDeps union externalDeps union classDigests).to(SortedSet) if xs.nonEmpty then stamps(className) = xs else () xs diff --git a/main/src/main/scala/sbt/internal/ProjectQuery.scala b/main/src/main/scala/sbt/internal/ProjectQuery.scala index b79e86b5b..ce65b5982 100644 --- a/main/src/main/scala/sbt/internal/ProjectQuery.scala +++ b/main/src/main/scala/sbt/internal/ProjectQuery.scala @@ -47,7 +47,7 @@ object ProjectQuery: .examples("@scalaBinaryVersion=3") .?) .map { case (proj, params) => - ProjectQuery(proj, Map(params.toSeq*)) + ProjectQuery(proj, params.toMap) } .filter( (q) => q.projectName.contains("...") || q.params.nonEmpty, diff --git a/run/src/main/scala/sbt/Fork.scala b/run/src/main/scala/sbt/Fork.scala index e4145980b..e7d355e6a 100644 --- a/run/src/main/scala/sbt/Fork.scala +++ b/run/src/main/scala/sbt/Fork.scala @@ -65,7 +65,7 @@ final class Fork(val commandName: String, val runnerClass: Option[String]) { if (Fork.shouldUseArgumentsFile(options)) new JProcessBuilder(executable, Fork.createArgumentsFile(options)) else - new JProcessBuilder(command.toArray*) + new JProcessBuilder(command*) workingDirectory.foreach(jpb.directory(_)) environment.foreach { case (k, v) => jpb.environment.put(k, v) } if (connectInput) {