diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-07-12 12:16:09 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-07-12 12:16:09 -0700 |
| commit | 11dcf82910b388046e675d76d277b09b931d5363 (patch) | |
| tree | 4d2c7f20c7b09f5389dcf12511aee08a2ad0db76 | |
| parent | 465b874df307848fca21e085ae32f28367699386 (diff) | |
| parent | 0c48ec17930b7925d4a798c4f9a4636d02f0aa2d (diff) | |
| download | scala-11dcf82910b388046e675d76d277b09b931d5363.tar.gz scala-11dcf82910b388046e675d76d277b09b931d5363.tar.bz2 scala-11dcf82910b388046e675d76d277b09b931d5363.zip | |
Merge pull request #2718 from soc/SI-7592-multihashmap
SI-7592 Remove scala.tools.nsc.util.MultiHashMap
| -rw-r--r-- | src/compiler/scala/tools/nsc/util/MultiHashMap.scala | 9 | ||||
| -rw-r--r-- | src/interactive/scala/tools/nsc/interactive/Global.scala | 6 |
2 files changed, 3 insertions, 12 deletions
diff --git a/src/compiler/scala/tools/nsc/util/MultiHashMap.scala b/src/compiler/scala/tools/nsc/util/MultiHashMap.scala deleted file mode 100644 index 67987c6e52..0000000000 --- a/src/compiler/scala/tools/nsc/util/MultiHashMap.scala +++ /dev/null @@ -1,9 +0,0 @@ -package scala.tools.nsc.util - -import scala.collection.{ mutable, immutable } - -/** A hashmap with set-valued values, and an empty set as default value - */ -class MultiHashMap[K, V] extends mutable.HashMap[K, immutable.Set[V]] { - override def default(key: K): immutable.Set[V] = Set() -} diff --git a/src/interactive/scala/tools/nsc/interactive/Global.scala b/src/interactive/scala/tools/nsc/interactive/Global.scala index 5875a44025..28b84d67ba 100644 --- a/src/interactive/scala/tools/nsc/interactive/Global.scala +++ b/src/interactive/scala/tools/nsc/interactive/Global.scala @@ -9,8 +9,7 @@ import java.io.{ PrintWriter, StringWriter, FileReader, FileWriter } import scala.collection.mutable import mutable.{LinkedHashMap, SynchronizedMap, HashSet, SynchronizedSet} import scala.util.control.ControlThrowable -import scala.tools.nsc.io.{ AbstractFile } -import scala.tools.nsc.util.MultiHashMap +import scala.tools.nsc.io.AbstractFile import scala.reflect.internal.util.{ SourceFile, BatchSourceFile, Position, NoPosition } import scala.tools.nsc.reporters._ import scala.tools.nsc.symtab._ @@ -181,7 +180,8 @@ class Global(settings: Settings, _reporter: Reporter, projectName: String = "") protected val toBeRemovedAfterRun: mutable.Set[AbstractFile] = new HashSet[AbstractFile] with SynchronizedSet[AbstractFile] - class ResponseMap extends MultiHashMap[SourceFile, Response[Tree]] { + class ResponseMap extends mutable.HashMap[SourceFile, Set[Response[Tree]]] { + override def default(key: SourceFile): Set[Response[Tree]] = Set() override def += (binding: (SourceFile, Set[Response[Tree]])) = { assert(interruptsEnabled, "delayed operation within an ask") super.+=(binding) |