diff options
author | Lukas Rytz <lukas.rytz@gmail.com> | 2014-10-12 21:19:02 +0200 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@gmail.com> | 2014-10-12 21:24:58 +0200 |
commit | 38587c5db1d84b6aef9e85ce94d49548c7fa2c66 (patch) | |
tree | 7a269757596c869b9d6397764e2096498e4bf548 /test | |
parent | 2b5df373638d08204b71258928289f6b39e25d5f (diff) | |
download | scala-38587c5db1d84b6aef9e85ce94d49548c7fa2c66.tar.gz scala-38587c5db1d84b6aef9e85ce94d49548c7fa2c66.tar.bz2 scala-38587c5db1d84b6aef9e85ce94d49548c7fa2c66.zip |
[nomerge] SI-8899 Revert "SI-8627 make Stream.filterNot non-eager"
This reverts commit 9276a1205f74fdec74206209712831913e93f359.
The change is not binary compatible, See discussion on SI-8899. Making
filterImpl non-private changes its call-sites (within TraversableLike)
from INVOKESTATIC to INVOKEINTERFACE. Subclasses of TraversableLike
compiled before this change don't have a mixin for filterImpl.
Diffstat (limited to 'test')
-rw-r--r-- | test/files/run/t4332.scala | 2 | ||||
-rw-r--r-- | test/junit/scala/collection/immutable/StreamTest.scala | 18 |
2 files changed, 1 insertions, 19 deletions
diff --git a/test/files/run/t4332.scala b/test/files/run/t4332.scala index 1c7e7d73de..5a67922911 100644 --- a/test/files/run/t4332.scala +++ b/test/files/run/t4332.scala @@ -12,7 +12,7 @@ object Test extends DirectTest { } def isExempt(sym: Symbol) = { - val exempt = Set("view", "repr", "sliceWithKnownDelta", "sliceWithKnownBound", "transform", "filterImpl") + val exempt = Set("view", "repr", "sliceWithKnownDelta", "sliceWithKnownBound", "transform") (exempt contains sym.name.decoded) } diff --git a/test/junit/scala/collection/immutable/StreamTest.scala b/test/junit/scala/collection/immutable/StreamTest.scala deleted file mode 100644 index 6dc1c79a48..0000000000 --- a/test/junit/scala/collection/immutable/StreamTest.scala +++ /dev/null @@ -1,18 +0,0 @@ -package scala.collection.immutable - -import org.junit.runner.RunWith -import org.junit.runners.JUnit4 -import org.junit.Test -import org.junit.Assert._ - -@RunWith(classOf[JUnit4]) -class StreamTest { - - @Test - def t6727_and_t6440(): Unit = { - assertTrue(Stream.continually(()).filter(_ => true).take(2) == Seq((), ())) - assertTrue(Stream.continually(()).filterNot(_ => false).take(2) == Seq((), ())) - assertTrue(Stream(1,2,3,4,5).filter(_ < 4) == Seq(1,2,3)) - assertTrue(Stream(1,2,3,4,5).filterNot(_ > 4) == Seq(1,2,3,4)) - } -} |