diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-08-31 10:58:51 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-08-31 10:58:51 -0700 |
commit | fcbb0e262051b36de8608b2fef24bf434adc6e99 (patch) | |
tree | 8629bf3ca9622ea34247b4c1355221cbdf9fc7ab /src | |
parent | 4f35ab77e6b4456025facc63297e7f2e93c2b9d0 (diff) | |
parent | c5f3d3f286ee5c26c8ddcf10f6878058e8f7e040 (diff) | |
download | scala-fcbb0e262051b36de8608b2fef24bf434adc6e99.tar.gz scala-fcbb0e262051b36de8608b2fef24bf434adc6e99.tar.bz2 scala-fcbb0e262051b36de8608b2fef24bf434adc6e99.zip |
Merge pull request #4691 from nicolasstucki/2.12.x-ScalaRunntime-fix-for-Scala.js
Remove unnecessary dependency on parallel collections in ScalaRunTime.
Diffstat (limited to 'src')
-rw-r--r-- | src/library/scala/runtime/ScalaRunTime.scala | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/library/scala/runtime/ScalaRunTime.scala b/src/library/scala/runtime/ScalaRunTime.scala index a0d89fc0e1..ce27a0ce63 100644 --- a/src/library/scala/runtime/ScalaRunTime.scala +++ b/src/library/scala/runtime/ScalaRunTime.scala @@ -9,11 +9,10 @@ package scala package runtime -import scala.collection.{ Seq, IndexedSeq, TraversableView, AbstractIterator } +import scala.collection.{ Seq, IndexedSeq, TraversableView, AbstractIterator, GenIterable } import scala.collection.mutable.WrappedArray import scala.collection.immutable.{ StringLike, NumericRange, List, Stream, Nil, :: } import scala.collection.generic.{ Sorted, IsTraversableLike } -import scala.collection.parallel.ParIterable import scala.reflect.{ ClassTag, classTag } import scala.util.control.ControlThrowable import java.lang.{ Class => jClass } @@ -326,8 +325,7 @@ object ScalaRunTime { case x if useOwnToString(x) => x.toString case x: AnyRef if isArray(x) => arrayToString(x) case x: scala.collection.Map[_, _] => x.iterator take maxElements map mapInner mkString (x.stringPrefix + "(", ", ", ")") - case x: Iterable[_] => x.iterator take maxElements map inner mkString (x.stringPrefix + "(", ", ", ")") - case x: ParIterable[_] => x.iterator take maxElements map inner mkString (x.stringPrefix + "(", ", ", ")") + case x: GenIterable[_] => x.iterator take maxElements map inner mkString (x.stringPrefix + "(", ", ", ")") case x: Traversable[_] => x take maxElements map inner mkString (x.stringPrefix + "(", ", ", ")") case x: Product1[_] if isTuple(x) => "(" + inner(x._1) + ",)" // that special trailing comma case x: Product if isTuple(x) => x.productIterator map inner mkString ("(", ",", ")") |