summaryrefslogtreecommitdiff
path: root/src/library/scala/collection/immutable/Stream.scala
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2012-11-25 13:31:52 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2012-11-25 13:31:52 -0800
commitb8f06f33a420cf07f980cab61b2a11df6a0f5dca (patch)
tree939c690f926c712c68eff3f04c1f6c34bbea6bfc /src/library/scala/collection/immutable/Stream.scala
parent8630176e985c5a8266d3afe4c4e3fb50d449630d (diff)
parentfaa6cfcf404b4d172f20b3ed01ba3bd59427b700 (diff)
downloadscala-b8f06f33a420cf07f980cab61b2a11df6a0f5dca.tar.gz
scala-b8f06f33a420cf07f980cab61b2a11df6a0f5dca.tar.bz2
scala-b8f06f33a420cf07f980cab61b2a11df6a0f5dca.zip
Merge pull request #1663 from paulp/merge-2.10.wip-x
Merge 2.10.0-wip into 2.10.x.
Diffstat (limited to 'src/library/scala/collection/immutable/Stream.scala')
-rw-r--r--src/library/scala/collection/immutable/Stream.scala1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/library/scala/collection/immutable/Stream.scala b/src/library/scala/collection/immutable/Stream.scala
index 426ab6f0fb..be2cd91c68 100644
--- a/src/library/scala/collection/immutable/Stream.scala
+++ b/src/library/scala/collection/immutable/Stream.scala
@@ -937,7 +937,6 @@ self =>
override def view = new StreamView[A, Stream[A]] {
protected lazy val underlying = self.repr
- override def isEmpty = self.isEmpty
override def iterator = self.iterator
override def length = self.length
override def apply(idx: Int) = self.apply(idx)