General cleanups and less warnings during a Scala build

1 files changed, 5 insertions, 8 deletions

diff --git a/src/compiler/scala/tools/ant/FastScalac.scala b/src/compiler/scala/tools/ant/FastScalac.scala
index e0b7be8004..3b62c493d3 100644
--- a/src/compiler/scala/tools/ant/FastScalac.scala
+++ b/src/compiler/scala/tools/ant/FastScalac.scala
@@ -109,7 +109,7 @@ class FastScalac extends Scalac {
       List(
         /*scalac*/
         s.debuginfo, s.target
-      ) filter (x => x.value != x.default) map (x => "%s:%s".format(x.name, x.value))
+      ) filter (x => x.value != x.default) map (x => s"${x.name}:${x.value}")
 
     val booleanSettings =
       List(
@@ -129,7 +129,7 @@ class FastScalac extends Scalac {
     val phaseSetting = {
       val s = settings.log
       if (s.value.isEmpty) Nil
-      else List("%s:%s".format(s.name, s.value.mkString(",")))
+      else List(s"${s.name}:${s.value.mkString(",")}")
     }
 
     val fscOptions =
@@ -147,8 +147,7 @@ class FastScalac extends Scalac {
         case cl: AntClassLoader =>
           path add new Path(getProject, cl.getClasspath)
         case _ =>
-          buildError("Compilation failed because of an internal compiler error;"+
-                     " see the error output for details.")
+          buildError("Compilation failed because of an internal compiler error; see the error output for details.")
       }
       path
     }
@@ -160,8 +159,7 @@ class FastScalac extends Scalac {
       File(url.getFile).jfile.getParentFile.getParentFile.getAbsolutePath
     } catch {
       case _: Throwable =>
-        buildError("Compilation failed because of an internal compiler error;"+
-                   " couldn't determine value for -Dscala.home=<value>")
+        buildError("Compilation failed because of an internal compiler error; couldn't determine value for -Dscala.home=<value>")
     }
     java.createJvmarg() setValue "-Dscala.usejavacp=true"
     java.createJvmarg() setValue ("-Dscala.home="+scalaHome)
@@ -186,7 +184,6 @@ class FastScalac extends Scalac {
     val res = execWithArgFiles(java, paths)
 
     if (failonerror && res != 0)
-      buildError("Compilation failed because of an internal compiler error;"+
-            " see the error output for details.")
+      buildError("Compilation failed because of an internal compiler error; see the error output for details.")
   }
 }