More deprecation avoidance and some minor smoot...

More deprecation avoidance and some minor smoothings.

4 files changed, 4 insertions, 13 deletions

diff --git a/src/library/scala/collection/mutable/PriorityQueue.scala b/src/library/scala/collection/mutable/PriorityQueue.scala
index aea7f3a567..d6b5d12749 100644
--- a/src/library/scala/collection/mutable/PriorityQueue.scala
+++ b/src/library/scala/collection/mutable/PriorityQueue.scala
@@ -142,7 +142,7 @@ class PriorityQueue[A](implicit ord: Ordering[A])
    *
    *  @param  iter        an iterable object
    */
-  override def ++(elems: scala.collection.Traversable[A]) = { this.clone() ++= elems }  // ??? XXX why does this "override nothing" with override?
+  override def ++(elems: scala.collection.Traversable[A]) = { this.clone() ++= elems }
 
   /** Adds all elements provided by an iterator into the priority queue.
    *
diff --git a/src/library/scala/io/UTF8Codec.scala b/src/library/scala/io/UTF8Codec.scala
index 4fac5bca47..ec328700cc 100644
--- a/src/library/scala/io/UTF8Codec.scala
+++ b/src/library/scala/io/UTF8Codec.scala
@@ -17,7 +17,7 @@ package scala.io
 object UTF8Codec
 {
   final val UNI_REPLACEMENT_CHAR: Int = 0x0000FFFD
-  final val UNI_REPLACEMENT_BYTES = encode(UNI_REPLACEMENT_CHAR)
+  final val UNI_REPLACEMENT_BYTES = Array[Byte](-17, -65, -67)
 
   // Note, from http://unicode.org/faq/utf_bom.html#utf8-5
   //
diff --git a/src/library/scala/runtime/RichException.scala b/src/library/scala/runtime/RichException.scala
index 27b3c719c6..6bb5d9e627 100644
--- a/src/library/scala/runtime/RichException.scala
+++ b/src/library/scala/runtime/RichException.scala
@@ -14,14 +14,5 @@ package scala.runtime
 import compat.Platform.EOL
 
 final class RichException(exc: Throwable) {
-
-  def getStackTraceString: String = {
-    val s = new StringBuilder()
-    for (trElem <- exc.getStackTrace()) {
-      s.append(trElem.toString())
-      s.append(EOL)
-    }
-    s.toString()
-  }
-
+  def getStackTraceString = exc.getStackTrace().mkString("", EOL, EOL)
 }
diff --git a/src/library/scala/xml/TopScope.scala b/src/library/scala/xml/TopScope.scala
index 41a1678a50..e0309757fb 100644
--- a/src/library/scala/xml/TopScope.scala
+++ b/src/library/scala/xml/TopScope.scala
@@ -16,7 +16,7 @@ import collection.mutable.StringBuilder
  *  for the &quot;xml&quot; prefix which is bound to
  *  &quot;http://www.w3.org/XML/1998/namespace&quot;
  */
-case object TopScope extends NamespaceBinding(null, null, null)
+object TopScope extends NamespaceBinding(null, null, null)
 {
   import XML.{ xml, namespace }