summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorSeth Tisue <seth@tisue.net>2015-09-02 18:25:29 -0400
committerSeth Tisue <seth@tisue.net>2015-09-02 18:25:29 -0400
commit5af7f23c63ea13b5132abeb2abaff8b44f5f5f2a (patch)
tree82b938a722474e371b334181d308c9902577b168 /src/library
parentfcbb0e262051b36de8608b2fef24bf434adc6e99 (diff)
parent2c16790ae48debe6e8b07b7ece86b0c665359cfd (diff)
downloadscala-5af7f23c63ea13b5132abeb2abaff8b44f5f5f2a.tar.gz
scala-5af7f23c63ea13b5132abeb2abaff8b44f5f5f2a.tar.bz2
scala-5af7f23c63ea13b5132abeb2abaff8b44f5f5f2a.zip
Merge pull request #4718 from Ichoran/issue/9379
SI-9379 Added toString to .zipped to allow Stream etc to short-circuit
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/runtime/Tuple2Zipped.scala2
-rw-r--r--src/library/scala/runtime/Tuple3Zipped.scala2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/library/scala/runtime/Tuple2Zipped.scala b/src/library/scala/runtime/Tuple2Zipped.scala
index 512c4fbc27..1c432b0403 100644
--- a/src/library/scala/runtime/Tuple2Zipped.scala
+++ b/src/library/scala/runtime/Tuple2Zipped.scala
@@ -110,6 +110,8 @@ final class Tuple2Zipped[El1, Repr1, El2, Repr2](val colls: (TraversableLike[El1
return
}
}
+
+ override def toString = "(%s, %s).zipped".format(colls._1.toString, colls._2.toString)
}
object Tuple2Zipped {
diff --git a/src/library/scala/runtime/Tuple3Zipped.scala b/src/library/scala/runtime/Tuple3Zipped.scala
index ffd44acf81..3bab86921b 100644
--- a/src/library/scala/runtime/Tuple3Zipped.scala
+++ b/src/library/scala/runtime/Tuple3Zipped.scala
@@ -118,6 +118,8 @@ final class Tuple3Zipped[El1, Repr1, El2, Repr2, El3, Repr3](val colls: (Travers
return
}
}
+
+ override def toString: String = "(%s, %s, %s).zipped".format(colls._1.toString, colls._2.toString, colls._3.toString)
}
object Tuple3Zipped {