Skip to content

remove legacy bincompat stuff in two places #4640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 21, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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