summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Rosset <denis.rosset@unige.ch>2014-08-10 07:29:59 +0200
committerDenis Rosset <denis.rosset@unige.ch>2014-08-10 07:29:59 +0200
commit9caf3ec7ed45a07cc82814d0146f0489be9da18e (patch)
tree46a219ab327ee676f4677e65cd864b46955a5b6b
parentb8deaa11cba964f686e33fe416758989df0f31eb (diff)
downloadscala-9caf3ec7ed45a07cc82814d0146f0489be9da18e.tar.gz
scala-9caf3ec7ed45a07cc82814d0146f0489be9da18e.tar.bz2
scala-9caf3ec7ed45a07cc82814d0146f0489be9da18e.zip
mutable.LongMap.fromZip takes collection.Iterable
The type should be qualified as collection.Iterable, because Iterable is that context is mutable.Iterable.
-rw-r--r--src/library/scala/collection/mutable/LongMap.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/collection/mutable/LongMap.scala b/src/library/scala/collection/mutable/LongMap.scala
index 984ae6f7cc..e0aac6574b 100644
--- a/src/library/scala/collection/mutable/LongMap.scala
+++ b/src/library/scala/collection/mutable/LongMap.scala
@@ -557,7 +557,7 @@ object LongMap {
/** Creates a new `LongMap` from keys and values.
* Equivalent to but more efficient than `LongMap((keys zip values): _*)`.
*/
- def fromZip[V](keys: Iterable[Long], values: Iterable[V]): LongMap[V] = {
+ def fromZip[V](keys: collection.Iterable[Long], values: collection.Iterable[V]): LongMap[V] = {
val sz = math.min(keys.size, values.size)
val lm = new LongMap[V](sz * 2)
val ki = keys.iterator