summaryrefslogtreecommitdiff
path: root/src/library/scala/collection/SeqLike.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-11-23 19:59:31 -0800
committerPaul Phillips <paulp@improving.org>2012-11-23 19:59:31 -0800
commitfaa6cfcf404b4d172f20b3ed01ba3bd59427b700 (patch)
tree2206b8defd7c433a2ef1dee3bd1b3f219d60949e /src/library/scala/collection/SeqLike.scala
parent5b498a2612f967c944fa1ed4f63a09d6acc41791 (diff)
parent57b91c5ee794cb8b66e298594a95a3fc829171f6 (diff)
downloadscala-faa6cfcf404b4d172f20b3ed01ba3bd59427b700.tar.gz
scala-faa6cfcf404b4d172f20b3ed01ba3bd59427b700.tar.bz2
scala-faa6cfcf404b4d172f20b3ed01ba3bd59427b700.zip
Merge remote-tracking branch 'origin/2.10.0-wip' into merge-2.10.wip-x
# By Jason Zaugg (8) and others # Via Adriaan Moors (6) and Josh Suereth (5) * origin/2.10.0-wip: Removing controversial `either` method from Futures API. SI-6624 set info of case pattern binder to help find case field accessors Fixes SI-6628, Revert "Fix for view isEmpty." SI-6661 - Remove obsolete implicit parameter of scala.concurrent.promise method Fixes SI-6559 - StringContext not using passed in escape function. SI-6648 copyAttrs must preserve TypeTree#wasEmpty Fix raw string interpolator: string parts which were after the first argument were still escaped Update comment. SI-6646 `ident` or Ident is always new binding. SI-6440 Address regressions around MissingRequirementError Refine the message and triggering of MissingRequirementError. SI-6640 Better reporting of deficient classpaths. SI-6644 Account for varargs in extmethod forwarder SI-6646 Fix regression in for desugaring. Update tools/epfl-publish
Diffstat (limited to 'src/library/scala/collection/SeqLike.scala')
-rw-r--r--src/library/scala/collection/SeqLike.scala1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/library/scala/collection/SeqLike.scala b/src/library/scala/collection/SeqLike.scala
index 0ffd99c88c..6871a3cb73 100644
--- a/src/library/scala/collection/SeqLike.scala
+++ b/src/library/scala/collection/SeqLike.scala
@@ -630,7 +630,6 @@ trait SeqLike[+A, +Repr] extends Any with IterableLike[A, Repr] with GenSeqLike[
override def view = new SeqView[A, Repr] {
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)