From 3c08eed2a6b8b061473459097b1733af91f3ca3d Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Tue, 1 Mar 2011 08:44:41 -0500 Subject: [PATCH] address some deprecations --- main/Build.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/Build.scala b/main/Build.scala index a8599122f..1931cfce9 100644 --- a/main/Build.scala +++ b/main/Build.scala @@ -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 } }