From d7ec1013da2b54abd92edea7b8adf0d1f7e50810 Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Wed, 1 Jan 2025 16:55:34 +0900 Subject: [PATCH] remove unused type params --- .../src/test/scala/sbt/complete/FileExamplesTest.scala | 2 +- .../sbt/internal/librarymanagement/SemanticSelectorExtra.scala | 2 +- .../src/main/scala/sbt/librarymanagement/VersionNumber.scala | 2 +- main/src/main/scala/sbt/internal/SettingCompletions.scala | 2 +- tasks-standard/src/main/scala/sbt/std/TaskExtra.scala | 2 +- tasks/src/main/scala/sbt/Execute.scala | 2 +- util-cache/src/main/scala/sbt/util/ActionCache.scala | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/util-complete/src/test/scala/sbt/complete/FileExamplesTest.scala b/internal/util-complete/src/test/scala/sbt/complete/FileExamplesTest.scala index 204a85d20..6fe4bb625 100644 --- a/internal/util-complete/src/test/scala/sbt/complete/FileExamplesTest.scala +++ b/internal/util-complete/src/test/scala/sbt/complete/FileExamplesTest.scala @@ -58,7 +58,7 @@ class FileExamplesTest extends UnitSpec { } } - def withDirectoryStructure[A](withCompletionPrefix: String = "")( + def withDirectoryStructure(withCompletionPrefix: String = "")( thunk: DirectoryStructure => Assertion ): Assertion = { IO.withTemporaryDirectory { tempDir => diff --git a/lm-core/src/main/scala/sbt/internal/librarymanagement/SemanticSelectorExtra.scala b/lm-core/src/main/scala/sbt/internal/librarymanagement/SemanticSelectorExtra.scala index b73f383a7..f56686646 100644 --- a/lm-core/src/main/scala/sbt/internal/librarymanagement/SemanticSelectorExtra.scala +++ b/lm-core/src/main/scala/sbt/internal/librarymanagement/SemanticSelectorExtra.scala @@ -209,7 +209,7 @@ private[librarymanagement] abstract class SemComparatorFunctions { case _ => throw new IllegalArgumentException(s"Invalid comparator: $comparator") } } - private def splitOn[A](s: String, sep: Char): Vector[String] = + private def splitOn(s: String, sep: Char): Vector[String] = if (s eq null) Vector() else s.split(sep).filterNot(_ == "").toVector private def splitDash(s: String) = splitOn(s, '-') diff --git a/lm-core/src/main/scala/sbt/librarymanagement/VersionNumber.scala b/lm-core/src/main/scala/sbt/librarymanagement/VersionNumber.scala index 36e55606a..c48570eec 100644 --- a/lm-core/src/main/scala/sbt/librarymanagement/VersionNumber.scala +++ b/lm-core/src/main/scala/sbt/librarymanagement/VersionNumber.scala @@ -58,7 +58,7 @@ object VersionNumber { def unapply(s: String): Option[(Seq[Long], Seq[String], Seq[String])] = { // null safe, empty string safe - def splitOn[A](s: String, sep: Char): Vector[String] = + def splitOn(s: String, sep: Char): Vector[String] = if (s eq null) Vector() else s.split(sep).filterNot(_ == "").toVector diff --git a/main/src/main/scala/sbt/internal/SettingCompletions.scala b/main/src/main/scala/sbt/internal/SettingCompletions.scala index ec58c6eb2..4485df615 100644 --- a/main/src/main/scala/sbt/internal/SettingCompletions.scala +++ b/main/src/main/scala/sbt/internal/SettingCompletions.scala @@ -356,7 +356,7 @@ private[sbt] object SettingCompletions { * Returns a string representation of the underlying type T for a `key` representing a `Setting[T]`, `Task[T]`, or `InputTask[T]`. * This string representation is currently a cleaned up toString of the underlying ClassTag. */ - def keyTypeString[T](key: AttributeKey[?]): String = + def keyTypeString(key: AttributeKey[?]): String = complete.TypeString.cleanup(key.tag.typeArg.toString) /** True if the `key` represents a setting or task that may be appended using an assignment method such as `+=`. */ diff --git a/tasks-standard/src/main/scala/sbt/std/TaskExtra.scala b/tasks-standard/src/main/scala/sbt/std/TaskExtra.scala index c79f05ddb..f198fad22 100644 --- a/tasks-standard/src/main/scala/sbt/std/TaskExtra.scala +++ b/tasks-standard/src/main/scala/sbt/std/TaskExtra.scala @@ -308,6 +308,6 @@ object TaskExtra extends TaskExtra { // The "taskDefinitionKey" is used, at least, by the ".previous" functionality. // But apparently it *cannot* survive a task map/flatMap/etc. See actions/depends-on. - private[sbt] def newAttributes[A](attributes: AttributeMap): AttributeMap = + private[sbt] def newAttributes(attributes: AttributeMap): AttributeMap = AttributeMap(attributes.entries.filter(_.key.label != "taskDefinitionKey")) } diff --git a/tasks/src/main/scala/sbt/Execute.scala b/tasks/src/main/scala/sbt/Execute.scala index e2fa4a579..2fd1eef7a 100644 --- a/tasks/src/main/scala/sbt/Execute.scala +++ b/tasks/src/main/scala/sbt/Execute.scala @@ -28,7 +28,7 @@ private[sbt] object Execute { private[sbt] def completed(p: => Unit): Completed = new Completed { def process(): Unit = p } - def noTriggers[TaskId[_]] = new Triggers(Map.empty, Map.empty, identity) + def noTriggers = new Triggers(Map.empty, Map.empty, identity) def config(checkCycles: Boolean, overwriteNode: Incomplete => Boolean = const(false)): Config = new Config(checkCycles, overwriteNode) diff --git a/util-cache/src/main/scala/sbt/util/ActionCache.scala b/util-cache/src/main/scala/sbt/util/ActionCache.scala index daa4edc70..599b6da92 100644 --- a/util-cache/src/main/scala/sbt/util/ActionCache.scala +++ b/util-cache/src/main/scala/sbt/util/ActionCache.scala @@ -120,7 +120,7 @@ object ActionCache: case Right(_) => true case Left(_) => false - inline private[sbt] def findActionResult[I: HashWriter, O]( + inline private[sbt] def findActionResult[I: HashWriter]( key: I, codeContentHash: Digest, extraHash: Digest,