diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-08-19 11:27:25 +0200 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-08-19 11:27:25 +0200 |
| commit | 5fac01e5a482370e706380822a6c21981697c83b (patch) | |
| tree | 013cec7a173285e384caadabd192ce27da559735 | |
| parent | afb0fb1fed8890cb164ae8ffc58e74e5fb59eb20 (diff) | |
| parent | 9caf3ec7ed45a07cc82814d0146f0489be9da18e (diff) | |
| download | scala-5fac01e5a482370e706380822a6c21981697c83b.tar.gz scala-5fac01e5a482370e706380822a6c21981697c83b.tar.bz2 scala-5fac01e5a482370e706380822a6c21981697c83b.zip | |
Merge pull request #3924 from denisrosset/2.12.x
mutable.LongMap.fromZip takes collection.Iterable
| -rw-r--r-- | src/library/scala/collection/mutable/LongMap.scala | 2 |
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 |