Reverted some minor changes from trunk on the o...

Reverted some minor changes from trunk on the off chance they can impact
binary compatibility.

3 files changed, 3 insertions, 16 deletions

diff --git a/src/library/scala/collection/mutable/StringBuilder.scala b/src/library/scala/collection/mutable/StringBuilder.scala
index 8d7ed8bcd2..edd59a8221 100644
--- a/src/library/scala/collection/mutable/StringBuilder.scala
+++ b/src/library/scala/collection/mutable/StringBuilder.scala
@@ -171,17 +171,6 @@ final class StringBuilder(private val underlying: JavaStringBuilder)
    */
   def +=(x: Char): this.type = { append(x); this }
 
-  /** Optimization.
-   */
-  def ++=(s: String): this.type = {
-    underlying append s
-    this
-  }
-  def appendAll(xs: String): StringBuilder = {
-    underlying append xs
-    this
-  }
-
   /** !!! This should create a new sequence.
    */
   def +(x: Char): this.type = { +=(x); this }
diff --git a/src/library/scala/collection/parallel/package.scala b/src/library/scala/collection/parallel/package.scala
index 7c83d43487..decae62dd2 100644
--- a/src/library/scala/collection/parallel/package.scala
+++ b/src/library/scala/collection/parallel/package.scala
@@ -121,10 +121,8 @@ package object parallel {
   /* classes */
 
   /** Composite throwable - thrown when multiple exceptions are thrown at the same time. */
-  final case class CompositeThrowable(val throwables: Set[Throwable])
-  extends Throwable("Multiple exceptions thrown during a parallel computation: " + throwables.map(
-    t => t + "\n" + t.getStackTrace.take(10).++("...").mkString("\n")
-  ).mkString("\n\n"))
+  final class CompositeThrowable(val throwables: Set[Throwable])
+  extends Throwable("Multiple exceptions thrown during a parallel computation: " + throwables.map(t => (t, t.getStackTrace.toList)).mkString(", "))
 
 
   /** A helper iterator for iterating very small array buffers.
diff --git a/src/library/scala/runtime/NonLocalReturnControl.scala b/src/library/scala/runtime/NonLocalReturnControl.scala
index 8be2745086..7c35e0b5cf 100644
--- a/src/library/scala/runtime/NonLocalReturnControl.scala
+++ b/src/library/scala/runtime/NonLocalReturnControl.scala
@@ -13,5 +13,5 @@ package scala.runtime
 import scala.util.control.ControlThrowable
 
 class NonLocalReturnControl[T](val key: AnyRef, val value: T) extends ControlThrowable {
-  final override def fillInStackTrace(): Throwable = this
+  override def fillInStackTrace(): Throwable = this
 }