mirror of https://github.com/sbt/sbt.git
Fix warnings about unused pattern vars in various projects
This commit is contained in:
parent
187a861194
commit
93e08b7ee7
|
|
@ -71,7 +71,7 @@ object Sync {
|
|||
|
||||
def noDuplicateTargets(relation: Relation[File, File]): Unit = {
|
||||
val dups = relation.reverseMap.filter {
|
||||
case (target, srcs) =>
|
||||
case (_, srcs) =>
|
||||
srcs.size >= 2 && srcs.exists(!_.isDirectory)
|
||||
} map {
|
||||
case (target, srcs) =>
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ object TestResultLogger {
|
|||
pendingCount) =
|
||||
results.events.foldLeft((0, 0, 0, 0, 0, 0, 0)) {
|
||||
case ((skippedAcc, errorAcc, passedAcc, failureAcc, ignoredAcc, canceledAcc, pendingAcc),
|
||||
(name, testEvent)) =>
|
||||
(name @ _, testEvent)) =>
|
||||
(skippedAcc + testEvent.skippedCount,
|
||||
errorAcc + testEvent.errorCount,
|
||||
passedAcc + testEvent.passedCount,
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@ object Tests {
|
|||
case Listeners(listeners) => testListeners ++= listeners
|
||||
case Setup(setupFunction) => setup += setupFunction
|
||||
case Cleanup(cleanupFunction) => cleanup += cleanupFunction
|
||||
case a: Argument => // now handled by whatever constructs `runners`
|
||||
case _: Argument => // now handled by whatever constructs `runners`
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -275,7 +275,7 @@ object Scope {
|
|||
case Select(conf) => index.config(configProj, conf); case _ => withZeroAxis(scope.config)
|
||||
}
|
||||
val tLin = scope.task match {
|
||||
case t @ Select(task) => linearize(t)(taskInherit); case _ => withZeroAxis(scope.task)
|
||||
case t @ Select(_) => linearize(t)(taskInherit); case _ => withZeroAxis(scope.task)
|
||||
}
|
||||
val eLin = withZeroAxis(scope.extra)
|
||||
for (c <- cLin; t <- tLin; e <- eLin) yield Scope(px, c, t, e)
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ final class SbtHandler(directory: File,
|
|||
|
||||
def onSbtInstance(i: Option[SbtInstance])(f: (Process, IPC.Server) => Unit): Option[SbtInstance] =
|
||||
i match {
|
||||
case Some(ai @ SbtInstance(process, server)) if server.isClosed =>
|
||||
case Some(SbtInstance(_, server)) if server.isClosed =>
|
||||
finish(i)
|
||||
onNewSbtInstance(f)
|
||||
case Some(SbtInstance(process, server)) =>
|
||||
|
|
@ -66,7 +66,7 @@ final class SbtHandler(directory: File,
|
|||
send("exit", server)
|
||||
process.exitValue()
|
||||
} catch {
|
||||
case e: IOException => process.destroy()
|
||||
case _: IOException => process.destroy()
|
||||
}
|
||||
case None =>
|
||||
}
|
||||
|
|
@ -85,7 +85,7 @@ final class SbtHandler(directory: File,
|
|||
val thread = new Thread() { override def run() = { p.exitValue(); server.close() } }
|
||||
thread.start()
|
||||
try { receive("Remote sbt initialization failed", server) } catch {
|
||||
case e: java.net.SocketException => throw new TestFailed("Remote sbt initialization failed")
|
||||
case _: java.net.SocketException => throw new TestFailed("Remote sbt initialization failed")
|
||||
}
|
||||
p
|
||||
}
|
||||
|
|
|
|||
|
|
@ -165,7 +165,7 @@ trait TaskExtra {
|
|||
Result.tryValues[S](tx :: Nil, x)
|
||||
})
|
||||
def ||[T >: S](alt: Task[T]): Task[T] = flatMapR {
|
||||
case Value(v) => task(v); case Inc(i) => alt
|
||||
case Value(v) => task(v); case Inc(_) => alt
|
||||
}
|
||||
def &&[T](alt: Task[T]): Task[T] = flatMap(_ => alt)
|
||||
}
|
||||
|
|
@ -242,7 +242,7 @@ object TaskExtra extends TaskExtra {
|
|||
case Seq() => sys.error("Cannot reduce empty sequence")
|
||||
case Seq(x) => x
|
||||
case Seq(x, y) => reducePair(x, y, f)
|
||||
case z =>
|
||||
case _ =>
|
||||
val (a, b) = i.splitAt(i.size / 2)
|
||||
reducePair(reduced(a, f), reduced(b, f), f)
|
||||
}
|
||||
|
|
@ -254,7 +254,7 @@ object TaskExtra extends TaskExtra {
|
|||
val incs = failuresM(a)(in)
|
||||
if (incs.isEmpty) expectedFailure else incs
|
||||
}
|
||||
def failM[T]: Result[T] => Incomplete = { case Inc(i) => i; case x => expectedFailure }
|
||||
def failM[T]: Result[T] => Incomplete = { case Inc(i) => i; case _ => expectedFailure }
|
||||
|
||||
def expectedFailure = throw Incomplete(None, message = Some("Expected dependency to fail."))
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ class JUnitXmlTestsListener(val outputDir: String) extends TestsListener {
|
|||
val hostname =
|
||||
try InetAddress.getLocalHost.getHostName
|
||||
catch {
|
||||
case x: IOException => "localhost"
|
||||
case _: IOException => "localhost"
|
||||
}
|
||||
|
||||
/**The dir in which we put all result files. Is equal to the given dir + "/test-reports"*/
|
||||
|
|
|
|||
Loading…
Reference in New Issue