summaryrefslogtreecommitdiff
path: root/src/actors
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-09-15 14:09:46 -0700
committerPaul Phillips <paulp@improving.org>2012-09-15 14:56:31 -0700
commitea0d891f238082089be037a0752215d9d21893cf (patch)
treeb166354f6621cf4adec4cf722b62fbdb5a2000d5 /src/actors
parent24580ac84242679619d27f20258078dd012c120a (diff)
downloadscala-ea0d891f238082089be037a0752215d9d21893cf.tar.gz
scala-ea0d891f238082089be037a0752215d9d21893cf.tar.bz2
scala-ea0d891f238082089be037a0752215d9d21893cf.zip
More relative path elimination.
Some names I missed in 55b609458fd . How one might know when one is done: mkdir scratch && cd scratch mkdir annotation beans collection compat concurrent io \ math parallel ref reflect runtime scala sys testing \ text tools util xml scalac $(find ../src/library -name '*.scala') Until recently that would fail with about a billion errors. When it compiles, that's when you're done. And that's where this commit takes us, for src/library at least.
Diffstat (limited to 'src/actors')
-rw-r--r--src/actors/scala/actors/Future.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/actors/scala/actors/Future.scala b/src/actors/scala/actors/Future.scala
index 0198e95ae1..fb7bb488a2 100644
--- a/src/actors/scala/actors/Future.scala
+++ b/src/actors/scala/actors/Future.scala
@@ -174,7 +174,7 @@ object Futures {
* or timeout + `System.currentTimeMillis()` is negative.
*/
def awaitAll(timeout: Long, fts: Future[Any]*): List[Option[Any]] = {
- var resultsMap: scala.collection.mutable.Map[Int, Option[Any]] = new collection.mutable.HashMap[Int, Option[Any]]
+ var resultsMap: scala.collection.mutable.Map[Int, Option[Any]] = new scala.collection.mutable.HashMap[Int, Option[Any]]
var cnt = 0
val mappedFts = fts.map(ft =>