luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removes a warning. Ref #4 

Exhaustion check was not picking up StaticScopes, which is an object.
This commit is contained in:
Eugene Yokota 2015-09-04 07:25:16 -04:00
parent c491f57f27
commit d482668c08
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/util-collection/src/main/scala/sbt/INode.scala
View File

@ -27,7 +27,6 @@ abstract class EvaluateSettings[Scope] {
case k: Keyed[s, T] @unchecked => single(getStatic(k.scopedKey), k.transform) 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 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 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: Value[T] @unchecked => constant(v.value)
case v: ValidationCapture[T] @unchecked => strictConstant(v.key) case v: ValidationCapture[T] @unchecked => strictConstant(v.key)
case t: TransformCapture => strictConstant(t.f) case t: TransformCapture => strictConstant(t.f)
@ -35,6 +34,7 @@ abstract class EvaluateSettings[Scope] {
case None => constant(() => o.f(None)) case None => constant(() => o.f(None))
case Some(i) => single[s, T](transform(i), x => o.f(Some(x))) case Some(i) => single[s, T](transform(i), x => o.f(Some(x)))
} }
case x if x == StaticScopes => strictConstant(allScopes.asInstanceOf[T]) // can't convince scalac that StaticScopes => T == Set[Scope]
} }
} }
private[this] lazy val roots: Seq[INode[_]] = compiledSettings flatMap { cs => private[this] lazy val roots: Seq[INode[_]] = compiledSettings flatMap { cs =>