Skip to content

Commit 1408162

Browse files
committed
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
1 parent 100a234 commit 1408162

File tree

3 files changed

+1
-23
lines changed

3 files changed

+1
-23
lines changed

src/library/scala/Predef.scala

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -269,13 +269,6 @@ object Predef extends LowPriorityImplicits with DeprecatedPredef {
269269
@inline def formatted(fmtstr: String): String = fmtstr format self
270270
}
271271

272-
// TODO: remove, only needed for binary compatibility of 2.11.0-RC1 with 2.11.0-M8
273-
// note that `private[scala]` becomes `public` in bytecode
274-
private[scala] final class StringAdd[A](private val self: A) extends AnyVal {
275-
def +(other: String): String = String.valueOf(self) + other
276-
}
277-
private[scala] def StringAdd(x: Any): Any = new StringAdd(x)
278-
279272
// SI-8229 retaining the pre 2.11 name for source compatibility in shadowing this implicit
280273
implicit final class any2stringadd[A](private val self: A) extends AnyVal {
281274
def +(other: String): String = String.valueOf(self) + other

src/library/scala/collection/immutable/Stream.scala

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -509,21 +509,6 @@ self =>
509509
else Stream.Empty
510510
}
511511

512-
/** Returns all the elements of this `Stream` that satisfy the predicate `p`
513-
* in a new `Stream` - i.e., it is still a lazy data structure. The order of
514-
* the elements is preserved
515-
*
516-
* @param p the predicate used to filter the stream.
517-
* @return the elements of this stream satisfying `p`.
518-
*
519-
* @example {{{
520-
* $naturalsEx
521-
* naturalsFrom(1) 10 } filter { _ % 5 == 0 } take 10 mkString(", ")
522-
* // produces
523-
* }}}
524-
*/
525-
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
526-
527512
/** A FilterMonadic which allows GC of the head of stream during processing */
528513
@noinline // Workaround SI-9137, see https://github.com/scala/scala/pull/4284#issuecomment-73180791
529514
override final def withFilter(p: A => Boolean): FilterMonadic[A, Stream[A]] = new Stream.StreamWithFilter(this, p)

versions.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jline.version=2.12.1
3030
scala-asm.version=5.0.4-scala-2
3131

3232
# external modules, used internally (not shipped)
33-
partest.version.number=1.0.7
33+
partest.version.number=1.0.9
3434
scalacheck.version.number=1.11.6
3535

3636
# TODO: modularize the compiler

0 commit comments

Comments
 (0)