diff options
| author | François Garillot <francois@garillot.net> | 2014-01-07 17:22:11 +0100 |
|---|---|---|
| committer | François Garillot <francois@garillot.net> | 2014-01-13 12:03:31 +0100 |
| commit | 806b6e412b718a7f222dbb423e8e9744e8f2b400 (patch) | |
| tree | 9365c17bea0b4f13c97cdf76d28e47d3610a4277 /src/library/scala/collection/immutable/TrieIterator.scala | |
| parent | 97b9b2c06a5f562b749eb34834096118f21ca843 (diff) | |
| download | scala-806b6e412b718a7f222dbb423e8e9744e8f2b400.tar.gz scala-806b6e412b718a7f222dbb423e8e9744e8f2b400.tar.bz2 scala-806b6e412b718a7f222dbb423e8e9744e8f2b400.zip | |
Backports library changes related to SI-6566 from a419799
The idea of backporting this occured while developing the -source flag
for SI-8126 : withouth this the library breaks at refchecks for a
Scala compiler that checks type aliases variance.
This shoudl be BC and promote good hygiene.
Diffstat (limited to 'src/library/scala/collection/immutable/TrieIterator.scala')
| -rw-r--r-- | src/library/scala/collection/immutable/TrieIterator.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/collection/immutable/TrieIterator.scala b/src/library/scala/collection/immutable/TrieIterator.scala index ae427852d4..b0bd253359 100644 --- a/src/library/scala/collection/immutable/TrieIterator.scala +++ b/src/library/scala/collection/immutable/TrieIterator.scala @@ -46,7 +46,7 @@ private[collection] abstract class TrieIterator[+T](elems: Array[Iterable[T]]) e case x: HashSetCollision1[_] => x.ks.map(x => HashSet(x)).toArray }).asInstanceOf[Array[Iterable[T]]] - private type SplitIterators = ((Iterator[T], Int), Iterator[T]) + private[this] type SplitIterators = ((Iterator[T], Int), Iterator[T]) private def isTrie(x: AnyRef) = x match { case _: HashTrieMap[_,_] | _: HashTrieSet[_] => true |