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

address some deprecations

This commit is contained in:
Mark Harrah 2011-03-01 08:44:41 -05:00
parent 98bd962952
commit 3c08eed2a6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/Build.scala
View File

@ -199,7 +199,7 @@ object Index
}
def stringToKeyMap(settings: Settings[Scope]): Map[String, AttributeKey[_]] =
{
val multiMap = settings.data.values.flatMap(_.keys).toList.removeDuplicates.groupBy(_.label)
val multiMap = settings.data.values.flatMap(_.keys).toList.distinct.groupBy(_.label)
val duplicates = multiMap collect { case (k, x1 :: x2 :: _) => k }
if(duplicates.isEmpty)
multiMap.mapValues(_.head)
@ -534,7 +534,7 @@ object Load
val ds = Discovery(subclassSet, Set.empty)(Test.allDefs(analysis))
ds.flatMap {
case (definition, Discovered(subs,_,_,true)) =>
if((subs ** subclassSet).isEmpty) Nil else definition.name :: Nil
if((subs & subclassSet).isEmpty) Nil else definition.name :: Nil
case _ => Nil
}
}