Skip to content

Commit

Permalink
remove legacy bincompat stuff in Predef.scala, Stream.scala
Browse files Browse the repository at this point in the history
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
  • Loading branch information
SethTisue committed Jul 21, 2015
1 parent 100a234 commit 1408162
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 23 deletions.
7 changes: 0 additions & 7 deletions src/library/scala/Predef.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 0 additions & 15 deletions src/library/scala/collection/immutable/Stream.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion versions.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1408162

Please sign in to comment.