From e0a51807bc4860f2228b69dc88584155d2668f20 Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Thu, 2 Jan 2025 10:35:15 +0900 Subject: [PATCH] change to using param anonymous if possible --- main-actions/src/main/scala/sbt/Sync.scala | 4 ++-- .../src/main/scala/sbt/std/InputTaskMacro.scala | 2 +- main-settings/src/main/scala/sbt/std/KeyMacro.scala | 2 +- main/src/main/scala/sbt/ProjectExtra.scala | 10 +++++----- main/src/main/scala/sbt/internal/Aggregation.scala | 2 +- main/src/main/scala/sbt/internal/Continuous.scala | 4 ++-- .../src/main/scala/sbt/internal/FileChangesMacro.scala | 4 ++-- .../main/scala/sbt/internal/SettingCompletions.scala | 2 +- .../src/main/scala/sbt/internal/util/INode.scala | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/main-actions/src/main/scala/sbt/Sync.scala b/main-actions/src/main/scala/sbt/Sync.scala index 6affcd96c..cf2d38da1 100644 --- a/main-actions/src/main/scala/sbt/Sync.scala +++ b/main-actions/src/main/scala/sbt/Sync.scala @@ -229,14 +229,14 @@ object Sync { private def readUncaught[F <: FileInfo]( store: CacheStore - )(using infoFormat: JsonFormat[F]): RelationInfo[F] = + )(using JsonFormat[F]): RelationInfo[F] = given IsoString[File] = fileIsoString import PathOnlyFormats.given store.read(default = (Relation.empty[File, File], Map.empty[File, F])) private def readUncaughtVirtual[F <: FileInfo]( store: CacheStore - )(using infoFormat: JsonFormat[F]): RelationInfoVirtual[F] = { + )(using JsonFormat[F]): RelationInfoVirtual[F] = { import sjsonnew.IsoString given IsoString[VirtualFileRef] = IsoString.iso[VirtualFileRef](_.toString, VirtualFileRef.of(_)) diff --git a/main-settings/src/main/scala/sbt/std/InputTaskMacro.scala b/main-settings/src/main/scala/sbt/std/InputTaskMacro.scala index 66dfb382d..e091d0df9 100644 --- a/main-settings/src/main/scala/sbt/std/InputTaskMacro.scala +++ b/main-settings/src/main/scala/sbt/std/InputTaskMacro.scala @@ -24,7 +24,7 @@ object InputTaskMacro: // inputTaskDynMacro0[A1](c)(t) private def inputTaskMacro0[A1: Type](tree: Expr[A1])(using - qctx: Quotes + Quotes ): Expr[Def.Initialize[InputTask[A1]]] = // println(s"tree = ${tree.show}") iInitializeMacro(tree) { et => diff --git a/main-settings/src/main/scala/sbt/std/KeyMacro.scala b/main-settings/src/main/scala/sbt/std/KeyMacro.scala index 1a8e2970d..ba171d757 100644 --- a/main-settings/src/main/scala/sbt/std/KeyMacro.scala +++ b/main-settings/src/main/scala/sbt/std/KeyMacro.scala @@ -57,7 +57,7 @@ private[sbt] object KeyMacro: private def errorMsg2: String = """project must be directly assigned to a val, such as `val x = project.in(file("core"))`.""" - private[sbt] def definingValName(errorMsg: String)(using qctx: Quotes): Expr[String] = + private[sbt] def definingValName(errorMsg: String)(using Quotes): Expr[String] = val term = enclosingTerm if term.isValDef then Expr(term.name) else errorAndAbort(errorMsg) diff --git a/main/src/main/scala/sbt/ProjectExtra.scala b/main/src/main/scala/sbt/ProjectExtra.scala index 5b88d37b8..3995ef597 100755 --- a/main/src/main/scala/sbt/ProjectExtra.scala +++ b/main/src/main/scala/sbt/ProjectExtra.scala @@ -485,9 +485,9 @@ trait ProjectExtra extends Scoped.Syntax: ) private[sbt] def relation(settings: Seq[Def.Setting[?]], actual: Boolean)(using - delegates: Scope => Seq[Scope], - scopeLocal: Def.ScopeLocal, - display: Show[ScopedKey[?]] + Scope => Seq[Scope], + Def.ScopeLocal, + Show[ScopedKey[?]] ): Relation[ScopedKey[?], ScopedKey[?]] = val cMap = Def.flattenLocals(Def.compiled(settings, actual)) val emptyRelation = Relation.empty[ScopedKey[?], ScopedKey[?]] @@ -496,11 +496,11 @@ trait ProjectExtra extends Scoped.Syntax: } private[sbt] def showDefinitions(key: AttributeKey[?], defs: Seq[Scope])(using - display: Show[ScopedKey[?]] + Show[ScopedKey[?]] ): String = showKeys(defs.map(scope => ScopedKey(scope, key))) - private[sbt] def showUses(defs: Seq[ScopedKey[?]])(using display: Show[ScopedKey[?]]): String = + private[sbt] def showUses(defs: Seq[ScopedKey[?]])(using Show[ScopedKey[?]]): String = showKeys(defs) private def showKeys(s: Seq[ScopedKey[?]])(using display: Show[ScopedKey[?]]): String = diff --git a/main/src/main/scala/sbt/internal/Aggregation.scala b/main/src/main/scala/sbt/internal/Aggregation.scala index 018bfee5d..2e1c869d1 100644 --- a/main/src/main/scala/sbt/internal/Aggregation.scala +++ b/main/src/main/scala/sbt/internal/Aggregation.scala @@ -73,7 +73,7 @@ object Aggregation { Command.applyEffect(seqParser(ps))(ts => runTasks(s, ts, DummyTaskMap(Nil), show)) private def showRun[A](complete: Complete[A], show: ShowConfig)(using - display: Show[ScopedKey[?]] + Show[ScopedKey[?]] ): Unit = import complete.* val log = state.log diff --git a/main/src/main/scala/sbt/internal/Continuous.scala b/main/src/main/scala/sbt/internal/Continuous.scala index 39af2b0e4..ed8782a78 100644 --- a/main/src/main/scala/sbt/internal/Continuous.scala +++ b/main/src/main/scala/sbt/internal/Continuous.scala @@ -988,7 +988,7 @@ private[sbt] object Continuous extends DeprecatedContinuous { end Config @nowarn - private def getStartMessage(key: ScopedKey[?])(using e: Extracted): StartMessage = Some { + private def getStartMessage(key: ScopedKey[?])(using Extracted): StartMessage = Some { lazy val default = key.get(watchStartMessage).getOrElse(Watch.defaultStartWatch) key.get(deprecatedWatchingMessage).map(Left(_)).getOrElse(Right(default)) } @@ -996,7 +996,7 @@ private[sbt] object Continuous extends DeprecatedContinuous { @nowarn private def getTriggerMessage( key: ScopedKey[?] - )(using e: Extracted): TriggerMessage = { + )(using Extracted): TriggerMessage = { lazy val default = key.get(watchTriggeredMessage).getOrElse(Watch.defaultOnTriggerMessage) key.get(deprecatedTriggeredMessage).map(Left(_)).getOrElse(Right(default)) diff --git a/main/src/main/scala/sbt/internal/FileChangesMacro.scala b/main/src/main/scala/sbt/internal/FileChangesMacro.scala index 84d79124f..8d0eb5793 100644 --- a/main/src/main/scala/sbt/internal/FileChangesMacro.scala +++ b/main/src/main/scala/sbt/internal/FileChangesMacro.scala @@ -78,7 +78,7 @@ object FileChangesMacro: currentKey: Expr[TaskKey[Seq[NioPath]]], changeKey: Expr[TaskKey[Seq[(NioPath, FileStamp)] => FileChanges]], mapKey: Expr[TaskKey[Seq[(NioPath, FileStamp)]]], - )(using qctx: Quotes): Expr[FileChanges] = + )(using Quotes): Expr[FileChanges] = val taskScope = getTaskScope[A](in) '{ val ts: Scope = $taskScope @@ -98,7 +98,7 @@ object FileChangesMacro: val ts = getTaskScope[A](in) '{ rescope[Seq[NioPath]]($ts, allOutputFiles).value } - private def getTaskScope[A: Type](in: Expr[TaskKey[A]])(using qctx: Quotes): Expr[sbt.Scope] = + private def getTaskScope[A: Type](in: Expr[TaskKey[A]])(using Quotes): Expr[sbt.Scope] = '{ if $in.scope.task.toOption.isDefined then $in.scope else $in.scope.copy(task = Select($in.key)) diff --git a/main/src/main/scala/sbt/internal/SettingCompletions.scala b/main/src/main/scala/sbt/internal/SettingCompletions.scala index 4485df615..39c805643 100644 --- a/main/src/main/scala/sbt/internal/SettingCompletions.scala +++ b/main/src/main/scala/sbt/internal/SettingCompletions.scala @@ -90,7 +90,7 @@ private[sbt] object SettingCompletions { session: SessionSettings, r: Relation[ScopedKey[?], ScopedKey[?]], redefined: Seq[Setting[?]], - )(using show: Show[ScopedKey[?]]): SetResult = { + )(using Show[ScopedKey[?]]): SetResult = { val redefinedKeys = redefined.map(_.key).toSet val affectedKeys = redefinedKeys.flatMap(r.reverse) def summary(verbose: Boolean): String = setSummary(redefinedKeys, affectedKeys, verbose) 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 d6ce1ba87..81dba5f1f 100644 --- a/util-collection/src/main/scala/sbt/internal/util/INode.scala +++ b/util-collection/src/main/scala/sbt/internal/util/INode.scala @@ -79,7 +79,7 @@ class EvaluateSettings[I <: Init]( getResults(using delegates) } - private def getResults(using delegates: ScopeType => Seq[ScopeType]) = + private def getResults(using ScopeType => Seq[ScopeType]) = static.toTypedSeq.foldLeft(empty) { case (ss, static.TPair(key, node)) => if key.key.isLocal then ss else ss.set(key, node.get)