From ced5230289249a44b2431d4ec642719e8b6f6188 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-R=C3=A9mi=20Desjardins?= Date: Wed, 10 Sep 2014 22:55:43 -0700 Subject: [PATCH] Remove some compiler warnings --- main/src/main/scala/sbt/Act.scala | 4 ++-- .../src/main/scala/sbt/classfile/Analyze.scala | 2 +- util/collection/src/main/scala/sbt/INode.scala | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/main/src/main/scala/sbt/Act.scala b/main/src/main/scala/sbt/Act.scala index 0e5059105..272f7e074 100644 --- a/main/src/main/scala/sbt/Act.scala +++ b/main/src/main/scala/sbt/Act.scala @@ -163,8 +163,8 @@ object Act { } def resolveTask(task: ParsedAxis[AttributeKey[_]]): Option[AttributeKey[_]] = task match { - case ParsedGlobal | Omitted => None - case t: ParsedValue[AttributeKey[_]] => Some(t.value) + case ParsedGlobal | Omitted => None + case t: ParsedValue[AttributeKey[_]]@unchecked => Some(t.value) } def filterStrings(base: Parser[String], valid: Set[String], label: String): Parser[String] = diff --git a/util/classfile/src/main/scala/sbt/classfile/Analyze.scala b/util/classfile/src/main/scala/sbt/classfile/Analyze.scala index aafe81095..0b12916b3 100644 --- a/util/classfile/src/main/scala/sbt/classfile/Analyze.scala +++ b/util/classfile/src/main/scala/sbt/classfile/Analyze.scala @@ -76,7 +76,7 @@ private[sbt] object Analyze { } private def trapAndLog(log: Logger)(execute: => Unit) { try { execute } - catch { case e => log.trace(e); log.error(e.toString) } + catch { case e: Throwable => log.trace(e); log.error(e.toString) } } private def guessSourceName(name: String) = Some(takeToDollar(trimClassExt(name))) private def takeToDollar(name: String) = diff --git a/util/collection/src/main/scala/sbt/INode.scala b/util/collection/src/main/scala/sbt/INode.scala index d56a22485..1af592f77 100644 --- a/util/collection/src/main/scala/sbt/INode.scala +++ b/util/collection/src/main/scala/sbt/INode.scala @@ -24,14 +24,14 @@ abstract class EvaluateSettings[Scope] { private[this] val transform: Initialize ~> INode = new (Initialize ~> INode) { def apply[T](i: Initialize[T]): INode[T] = i match { - case k: Keyed[s, T] => single(getStatic(k.scopedKey), k.transform) - case a: Apply[k, T] => new MixedNode[k, T](a.alist.transform[Initialize, INode](a.inputs, transform), a.f, a.alist) - case b: Bind[s, T] => new BindNode[s, T](transform(b.in), x => transform(b.f(x))) - case init.StaticScopes => strictConstant(allScopes.asInstanceOf[T]) // can't convince scalac that StaticScopes => T == Set[Scope] - case v: Value[T] => constant(v.value) - case v: ValidationCapture[T] => strictConstant(v.key) - case t: TransformCapture => strictConstant(t.f) - case o: Optional[s, T] => o.a match { + case k: Keyed[s, T] @unchecked => single(getStatic(k.scopedKey), k.transform) + case a: Apply[k, T] @unchecked => new MixedNode[k, T](a.alist.transform[Initialize, INode](a.inputs, transform), a.f, a.alist) + case b: Bind[s, T] @unchecked => new BindNode[s, T](transform(b.in), x => transform(b.f(x))) + case init.StaticScopes => strictConstant(allScopes.asInstanceOf[T]) // can't convince scalac that StaticScopes => T == Set[Scope] + case v: Value[T] @unchecked => constant(v.value) + case v: ValidationCapture[T] @unchecked => strictConstant(v.key) + case t: TransformCapture => strictConstant(t.f) + case o: Optional[s, T] @unchecked => o.a match { case None => constant(() => o.f(None)) case Some(i) => single[s, T](transform(i), x => o.f(Some(x))) }