1 files changed, 10 insertions, 11 deletions
diff --git a/src/reflect/scala/reflect/internal/util/StringOps.scala b/src/reflect/scala/reflect/internal/util/StringOps.scala
index efb8126ff0..2fee6b0f82 100644
--- a/src/reflect/scala/reflect/internal/util/StringOps.scala
+++ b/src/reflect/scala/reflect/internal/util/StringOps.scala
@@ -11,7 +11,7 @@ package reflect
 package internal
 package util
 
-import scala.compat.Platform.EOL
+import java.lang.System.{lineSeparator => EOL}
 
 /** This object provides utility methods to extract elements
  *  from Strings.
@@ -45,7 +45,7 @@ trait StringOps {
     else s.substring(0, end)
   }
   /** Breaks the string into lines and strips each line before reassembling. */
-  def trimAllTrailingSpace(s: String): String = s.lines map trimTrailingSpace mkString EOL
+  def trimAllTrailingSpace(s: String): String = s.lines.map(trimTrailingSpace).mkString(EOL)
 
   def decompose(str: String, sep: Char): List[String] = {
     def ws(start: Int): List[String] =
@@ -69,18 +69,17 @@ trait StringOps {
     else Some((str take idx, str drop (if (doDropIndex) idx + 1 else idx)))
 
   /** Returns a string meaning "n elements".
+   *  Don't try an element such as "index" with irregular plural.
    */
-  def countElementsAsString(n: Int, elements: String): String =
+  def countElementsAsString(n: Int, element: String): String =
     n match {
-      case 0 => "no "    + elements + "s"
-      case 1 => "one "   + elements
-      case 2 => "two "   + elements + "s"
-      case 3 => "three " + elements + "s"
-      case 4 => "four "  + elements + "s"
-      case _ => "" + n + " " + elements + "s"
+      case 0 => s"no ${element}s"
+      case 1 => s"one ${element}"
+      case _ => s"${countAsString(n)} ${element}s"
     }
 
   /** Turns a count into a friendly English description if n<=4.
+   *  Otherwise, a scary math representation.
    */
   def countAsString(n: Int): String =
     n match {
@@ -89,8 +88,8 @@ trait StringOps {
       case 2 => "two"
       case 3 => "three"
       case 4 => "four"
-      case _ => "" + n
+      case _ => n.toString
     }
 }
 
-object StringOps extends StringOps { }
+object StringOps extends StringOps