From badee8bacdba9446e9b471476e905fcb71b72cc1 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Wed, 13 Feb 2013 03:25:13 -0500 Subject: [PATCH] Update to 2.10.1-RC1 Needed an explicit type in PMap to workaround an error. Need to drop tuple assignment of parser.parsed in input task macro as a workaround for macro/resetAllAttrs/pattern matching/annotation issue in RC1. --- util/collection/src/main/scala/sbt/PMap.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/util/collection/src/main/scala/sbt/PMap.scala b/util/collection/src/main/scala/sbt/PMap.scala index 8b1772220..9cf7f26f2 100644 --- a/util/collection/src/main/scala/sbt/PMap.scala +++ b/util/collection/src/main/scala/sbt/PMap.scala @@ -3,7 +3,6 @@ */ package sbt - import Types._ import collection.mutable trait RMap[K[_], V[_]] @@ -12,7 +11,7 @@ trait RMap[K[_], V[_]] def get[T](k: K[T]): Option[V[T]] def contains[T](k: K[T]): Boolean def toSeq: Seq[(K[_], V[_])] - def toTypedSeq = toSeq.map{ case (k: K[t],v) => TPair[t](k,v.asInstanceOf[V[t]]) } + def toTypedSeq: Seq[TPair[_]] = toSeq.map{ case (k: K[t],v) => TPair[t](k,v.asInstanceOf[V[t]]) } def keys: Iterable[K[_]] def values: Iterable[V[_]] def isEmpty: Boolean