diff options
author | Seth Tisue <seth@tisue.net> | 2015-07-16 08:25:54 -0400 |
---|---|---|
committer | Seth Tisue <seth@tisue.net> | 2015-07-21 15:05:35 -0400 |
commit | 1408162d1b7c3da84bfcb7cf2a0d2884c931bea8 (patch) | |
tree | 935ba337a4c7fb0020bc3d40de18fcdc8b9d744f | |
parent | 100a234882a86a249ebe586b4e75fede58c098c3 (diff) | |
download | scala-1408162d1b7c3da84bfcb7cf2a0d2884c931bea8.tar.gz scala-1408162d1b7c3da84bfcb7cf2a0d2884c931bea8.tar.bz2 scala-1408162d1b7c3da84bfcb7cf2a0d2884c931bea8.zip |
remove legacy bincompat stuff in Predef.scala, Stream.scala
it was only there to preserve binary compatibility within
the 2.11.x series
includes updated partest, since the old partest ran afoul
of the Stream change
-rw-r--r-- | src/library/scala/Predef.scala | 7 | ||||
-rw-r--r-- | src/library/scala/collection/immutable/Stream.scala | 15 | ||||
-rw-r--r-- | versions.properties | 2 |
3 files changed, 1 insertions, 23 deletions
diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala index 281e056330..fa58015a84 100644 --- a/src/library/scala/Predef.scala +++ b/src/library/scala/Predef.scala @@ -269,13 +269,6 @@ object Predef extends LowPriorityImplicits with DeprecatedPredef { @inline def formatted(fmtstr: String): String = fmtstr format self } - // TODO: remove, only needed for binary compatibility of 2.11.0-RC1 with 2.11.0-M8 - // note that `private[scala]` becomes `public` in bytecode - private[scala] final class StringAdd[A](private val self: A) extends AnyVal { - def +(other: String): String = String.valueOf(self) + other - } - private[scala] def StringAdd(x: Any): Any = new StringAdd(x) - // SI-8229 retaining the pre 2.11 name for source compatibility in shadowing this implicit implicit final class any2stringadd[A](private val self: A) extends AnyVal { def +(other: String): String = String.valueOf(self) + other diff --git a/src/library/scala/collection/immutable/Stream.scala b/src/library/scala/collection/immutable/Stream.scala index 6c5b10e73b..1d0d40a1d8 100644 --- a/src/library/scala/collection/immutable/Stream.scala +++ b/src/library/scala/collection/immutable/Stream.scala @@ -509,21 +509,6 @@ self => else Stream.Empty } - /** Returns all the elements of this `Stream` that satisfy the predicate `p` - * in a new `Stream` - i.e., it is still a lazy data structure. The order of - * the elements is preserved - * - * @param p the predicate used to filter the stream. - * @return the elements of this stream satisfying `p`. - * - * @example {{{ - * $naturalsEx - * naturalsFrom(1) 10 } filter { _ % 5 == 0 } take 10 mkString(", ") - * // produces - * }}} - */ - override def filter(p: A => Boolean): Stream[A] = filterImpl(p, isFlipped = false) // This override is only left in 2.11 because of binary compatibility, see PR #3925 - /** A FilterMonadic which allows GC of the head of stream during processing */ @noinline // Workaround SI-9137, see https://github.com/scala/scala/pull/4284#issuecomment-73180791 override final def withFilter(p: A => Boolean): FilterMonadic[A, Stream[A]] = new Stream.StreamWithFilter(this, p) diff --git a/versions.properties b/versions.properties index be197af2ac..e18229ae26 100644 --- a/versions.properties +++ b/versions.properties @@ -30,7 +30,7 @@ jline.version=2.12.1 scala-asm.version=5.0.4-scala-2 # external modules, used internally (not shipped) -partest.version.number=1.0.7 +partest.version.number=1.0.9 scalacheck.version.number=1.11.6 # TODO: modularize the compiler |