Skip to content

Commit ef63cb9

Browse files
authored
Merge pull request scala#5595 from monkey-mas/remove-unnecessary-methods-from-traversableonce
Remove unnecessary methods in TraversableOnce
2 parents 2957eae + abd3482 commit ef63cb9

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed

src/library/scala/collection/TraversableOnce.scala

-6
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,6 @@ import scala.reflect.ClassTag
6262
trait TraversableOnce[+A] extends Any with GenTraversableOnce[A] {
6363
self =>
6464

65-
//TODO 2.12: Remove these methods. They are already defined in GenTraversableOnce
66-
/* Self-documenting abstract methods. */
67-
def foreach[U](f: A => U): Unit
68-
def isEmpty: Boolean
69-
def hasDefiniteSize: Boolean
70-
7165
// Note: We could redefine this in TraversableLike to always return `repr`
7266
// of type `Repr`, only if `Repr` had type bounds, which it doesn't, because
7367
// not all `Repr` are a subtype `TraversableOnce[A]`.

test/files/neg/abstract-report.check

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ it has 12 unimplemented members.
44
* For convenience, these are usable as stub implementations.
55
*/
66
// Members declared in scala.collection.GenTraversableOnce
7+
def foreach[U](f: String => U): Unit = ???
8+
def hasDefiniteSize: Boolean = ???
9+
def isEmpty: Boolean = ???
710
def isTraversableAgain: Boolean = ???
811
def toIterator: Iterator[String] = ???
912
def toStream: Stream[String] = ???
@@ -13,9 +16,6 @@ it has 12 unimplemented members.
1316
def exists(p: String => Boolean): Boolean = ???
1417
def find(p: String => Boolean): Option[String] = ???
1518
def forall(p: String => Boolean): Boolean = ???
16-
def foreach[U](f: String => U): Unit = ???
17-
def hasDefiniteSize: Boolean = ???
18-
def isEmpty: Boolean = ???
1919
def seq: scala.collection.TraversableOnce[String] = ???
2020
def toTraversable: Traversable[String] = ???
2121

test/files/neg/abstract-report2.check

+3-3
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ it has 24 unimplemented members.
8080
def toArray(): Array[Object] = ???
8181

8282
// Members declared in scala.collection.GenTraversableOnce
83+
def foreach[U](f: ((Set[Int], String)) => U): Unit = ???
84+
def hasDefiniteSize: Boolean = ???
85+
def isEmpty: Boolean = ???
8386
def isTraversableAgain: Boolean = ???
8487
def toIterator: Iterator[(Set[Int], String)] = ???
8588
def toStream: Stream[(Set[Int], String)] = ???
@@ -89,9 +92,6 @@ it has 24 unimplemented members.
8992
def exists(p: ((Set[Int], String)) => Boolean): Boolean = ???
9093
def find(p: ((Set[Int], String)) => Boolean): Option[(Set[Int], String)] = ???
9194
def forall(p: ((Set[Int], String)) => Boolean): Boolean = ???
92-
def foreach[U](f: ((Set[Int], String)) => U): Unit = ???
93-
def hasDefiniteSize: Boolean = ???
94-
def isEmpty: Boolean = ???
9595
def seq: scala.collection.TraversableOnce[(Set[Int], String)] = ???
9696
def toTraversable: Traversable[(Set[Int], String)] = ???
9797

0 commit comments

Comments
 (0)