8 files changed, 10 insertions, 10 deletions
diff --git a/src/compiler/scala/tools/ant/Same.scala b/src/compiler/scala/tools/ant/Same.scala
index 3f67531452..6c59f57073 100644
--- a/src/compiler/scala/tools/ant/Same.scala
+++ b/src/compiler/scala/tools/ant/Same.scala
@@ -125,7 +125,7 @@ class Same extends MatchingTask {
     val destBuffer = new Array[Byte](bufferSize)
     for (
       originName: String <- originNames;
-      destName: String <- mapper.mapFileName(originName.toString)
+      destName: String <- mapper.mapFileName(originName)
     ) {
       //println("originName="+originName)
       //println("destName  ="+destName)
diff --git a/src/compiler/scala/tools/ant/Scalac.scala b/src/compiler/scala/tools/ant/Scalac.scala
index 34afad934f..361292ef2b 100644
--- a/src/compiler/scala/tools/ant/Scalac.scala
+++ b/src/compiler/scala/tools/ant/Scalac.scala
@@ -510,7 +510,7 @@ class Scalac extends MatchingTask {
         }
       }
       yield {
-        log(originFile.toString, Project.MSG_DEBUG)
+        log(originFile, Project.MSG_DEBUG)
         nameToFile(originDir)(originFile)
       }
 
diff --git a/src/compiler/scala/tools/ant/Scaladoc.scala b/src/compiler/scala/tools/ant/Scaladoc.scala
index b197dd0bc8..79abc2740c 100644
--- a/src/compiler/scala/tools/ant/Scaladoc.scala
+++ b/src/compiler/scala/tools/ant/Scaladoc.scala
@@ -508,7 +508,7 @@ class Scaladoc extends MatchingTask {
           list
         }
       } yield {
-        log(originFile.toString, Project.MSG_DEBUG)
+        log(originFile, Project.MSG_DEBUG)
         nameToFile(originDir)(originFile)
       }
 
diff --git a/src/compiler/scala/tools/nsc/MainTokenMetric.scala b/src/compiler/scala/tools/nsc/MainTokenMetric.scala
index f555928a20..bf4cff7795 100644
--- a/src/compiler/scala/tools/nsc/MainTokenMetric.scala
+++ b/src/compiler/scala/tools/nsc/MainTokenMetric.scala
@@ -34,7 +34,7 @@ object MainTokenMetric {
       }
       Console.print(i.toString())
       Console.print(" ")
-      Console.println(source.toString())
+      Console.println(source)
       totale += i
     }
     Console.println(totale.toString()+" total")
diff --git a/src/compiler/scala/tools/nsc/ast/TreePrinters.scala b/src/compiler/scala/tools/nsc/ast/TreePrinters.scala
index b148bb9b56..fd1c3e786b 100644
--- a/src/compiler/scala/tools/nsc/ast/TreePrinters.scala
+++ b/src/compiler/scala/tools/nsc/ast/TreePrinters.scala
@@ -110,7 +110,7 @@ abstract class TreePrinters {
 
     def printFlags(flags: Long, privateWithin: String) {
       var mask: Long = if (settings.debug.value) -1L else PrintableFlags
-      val s = flagsToString(flags & mask, privateWithin.toString)
+      val s = flagsToString(flags & mask, privateWithin)
       if (s.length() != 0) print(s + " ")
     }
 
diff --git a/src/compiler/scala/tools/nsc/models/SemanticTokens.scala b/src/compiler/scala/tools/nsc/models/SemanticTokens.scala
index 1f246078f4..dd2cc02a45 100644
--- a/src/compiler/scala/tools/nsc/models/SemanticTokens.scala
+++ b/src/compiler/scala/tools/nsc/models/SemanticTokens.scala
@@ -159,7 +159,7 @@ class SemanticTokens(val compiler: Global) {
       else new Info(symbol)
 
     abstract class Semantic(val symbol: Symbol) extends Actual {
-      val name = NameTransformer.decode(symbol.name.toString()).toString().trim()
+      val name = NameTransformer.decode(symbol.name.toString).trim()
       assert(symbol != NoSymbol)
       def myOuter = Process.this
 
@@ -519,7 +519,7 @@ class SemanticTokens(val compiler: Global) {
       //Thread.dumpStack()
     }
     else if (term != NoSymbol) {
-      val name = NameTransformer.decode(term.name.toString()).toString().trim()
+      val name = NameTransformer.decode(term.name.toString).trim()
       val buf = unit.source.asInstanceOf[BatchSourceFile].content
       val cs = name.toChars
       var idx = 0
diff --git a/src/compiler/scala/tools/nsc/symtab/StdNames.scala b/src/compiler/scala/tools/nsc/symtab/StdNames.scala
index 9403280384..69b7448bf1 100644
--- a/src/compiler/scala/tools/nsc/symtab/StdNames.scala
+++ b/src/compiler/scala/tools/nsc/symtab/StdNames.scala
@@ -151,10 +151,10 @@ trait StdNames {
     def isProtectedAccessor(name: Name) = name.startsWith(PROTECTED_PREFIX)
 
     /** The name of an accessor for protected symbols. */
-    def protName(name: Name): Name = newTermName(PROTECTED_PREFIX.toString() + name)
+    def protName(name: Name): Name = newTermName(PROTECTED_PREFIX + name)
 
     /** The name of a setter for protected symbols. Used for inherited Java fields. */
-    def protSetterName(name: Name): Name = newTermName(PROTECTED_PREFIX.toString() + "set" + name)
+    def protSetterName(name: Name): Name = newTermName(PROTECTED_PREFIX + "set" + name)
 
     /** The name of bitmaps for initialized lazy vals. */
     def bitmapName(n: Int): Name = newTermName("bitmap$" + n)
diff --git a/src/compiler/scala/tools/nsc/symtab/Symbols.scala b/src/compiler/scala/tools/nsc/symtab/Symbols.scala
index 3208ea16b0..e863e12766 100644
--- a/src/compiler/scala/tools/nsc/symtab/Symbols.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Symbols.scala
@@ -1123,7 +1123,7 @@ trait Symbols {
      *  If settings.uniquId adds id.
      */
     def nameString: String = {
-      var s = simpleName.decode.toString
+      var s = simpleName.decode
       if (s endsWith nme.LOCAL_SUFFIX)
         s = s.substring(0, s.length - nme.LOCAL_SUFFIX.length)
       if (s endsWith ".type")