Another round of deprecation warning elimination.

11 files changed, 21 insertions, 22 deletions

diff --git a/src/compiler/scala/tools/ant/Same.scala b/src/compiler/scala/tools/ant/Same.scala
index 97bfc6947a..d5cba4a0bf 100644
--- a/src/compiler/scala/tools/ant/Same.scala
+++ b/src/compiler/scala/tools/ant/Same.scala
@@ -37,7 +37,7 @@ import org.apache.tools.ant.types.Mapper
 class Same extends MatchingTask {
 
   /** The unique Ant file utilities instance to use in this task. */
-  private val fileUtils = FileUtils.newFileUtils()
+  private val fileUtils = FileUtils.getFileUtils()
 
 /*============================================================================*\
 **                             Ant user-properties                            **
diff --git a/src/compiler/scala/tools/ant/ScalaBazaar.scala b/src/compiler/scala/tools/ant/ScalaBazaar.scala
index ae45a81186..30fd8947f5 100644
--- a/src/compiler/scala/tools/ant/ScalaBazaar.scala
+++ b/src/compiler/scala/tools/ant/ScalaBazaar.scala
@@ -56,7 +56,7 @@ package scala.tools.ant {
   class ScalaBazaar extends Task {
 
     /** The unique Ant file utilities instance to use in this task. */
-    private val fileUtils = FileUtils.newFileUtils()
+    private val fileUtils = FileUtils.getFileUtils()
 
 /******************************************************************************\
 **                             Ant user-properties                            **
diff --git a/src/compiler/scala/tools/ant/Scalac.scala b/src/compiler/scala/tools/ant/Scalac.scala
index bb5dc77050..8bd5444ee3 100644
--- a/src/compiler/scala/tools/ant/Scalac.scala
+++ b/src/compiler/scala/tools/ant/Scalac.scala
@@ -72,7 +72,7 @@ import scala.tools.nsc.reporters.{Reporter, ConsoleReporter}
 class Scalac extends MatchingTask {
 
   /** The unique Ant file utilities instance to use in this task. */
-  private val fileUtils = FileUtils.newFileUtils()
+  private val fileUtils = FileUtils.getFileUtils()
 
 /*============================================================================*\
 **                             Ant user-properties                            **
diff --git a/src/compiler/scala/tools/ant/Scaladoc.scala b/src/compiler/scala/tools/ant/Scaladoc.scala
index f7e44b6b88..4d8333ae93 100644
--- a/src/compiler/scala/tools/ant/Scaladoc.scala
+++ b/src/compiler/scala/tools/ant/Scaladoc.scala
@@ -65,7 +65,7 @@ import scala.tools.nsc.reporters.{Reporter, ConsoleReporter}
 class Scaladoc extends MatchingTask {
 
   /** The unique Ant file utilities instance to use in this task. */
-  private val fileUtils = FileUtils.newFileUtils()
+  private val fileUtils = FileUtils.getFileUtils()
 
 /*============================================================================*\
 **                             Ant user-properties                            **
diff --git a/src/compiler/scala/tools/ant/sabbus/Make.scala b/src/compiler/scala/tools/ant/sabbus/Make.scala
index ddae0a1ecc..d1579670ac 100644
--- a/src/compiler/scala/tools/ant/sabbus/Make.scala
+++ b/src/compiler/scala/tools/ant/sabbus/Make.scala
@@ -23,6 +23,6 @@ class Make extends Task with TaskArgs {
     if (!compilationPath.isEmpty) settings.classpath = compilationPath.get
     if (!sourcePath.isEmpty) settings.sourcepath = sourcePath.get
     if (!params.isEmpty) settings.more = params.get
-    Compilers.make(id.get, (compilerPath.get.list.map{ path => new File(path).toURL }), settings)
+    Compilers.make(id.get, (compilerPath.get.list.map{ path => new File(path).toURI.toURL }), settings)
   }
 }
diff --git a/src/compiler/scala/tools/nsc/Interpreter.scala b/src/compiler/scala/tools/nsc/Interpreter.scala
index 1b890d91ad..a8152dce02 100644
--- a/src/compiler/scala/tools/nsc/Interpreter.scala
+++ b/src/compiler/scala/tools/nsc/Interpreter.scala
@@ -125,7 +125,7 @@ class Interpreter(val settings: Settings, out: PrintWriter)
       catching(classOf[MalformedURLException]) opt new URL(s)
 
     val classpathPart =
-      ClassPath.expandPath(compiler.settings.classpath.value).map(s => new File(s).toURL)
+      ClassPath.expandPath(compiler.settings.classpath.value).map(s => new File(s).toURI.toURL)
     val codebasePart =
       (compiler.settings.Xcodebase.value.split(" ")).toList flatMap parseURL
 
diff --git a/src/compiler/scala/tools/nsc/MainGenericRunner.scala b/src/compiler/scala/tools/nsc/MainGenericRunner.scala
index d9dfee4e4a..cd16ef8c8b 100644
--- a/src/compiler/scala/tools/nsc/MainGenericRunner.scala
+++ b/src/compiler/scala/tools/nsc/MainGenericRunner.scala
@@ -80,7 +80,7 @@ object MainGenericRunner {
       if (b) exitSuccess else exitFailure(null)
 
     def fileToURL(f: File): Option[URL] =
-      try { Some(f.toURL) }
+      try { Some(f.toURI.toURL) }
       catch { case e => Console.println(e); None }
 
     def paths(str: String): List[URL] =
diff --git a/src/compiler/scala/tools/nsc/ScriptRunner.scala b/src/compiler/scala/tools/nsc/ScriptRunner.scala
index cca9be181a..3423f8f45f 100644
--- a/src/compiler/scala/tools/nsc/ScriptRunner.scala
+++ b/src/compiler/scala/tools/nsc/ScriptRunner.scala
@@ -308,7 +308,7 @@ object ScriptRunner
 		scriptArgs: List[String]): Boolean =
 	{
     def fileToURL(f: JFile): Option[URL] =
-      try Some(f.toURL) catch { case _: Exception => None }
+      try Some(f.toURI.toURL) catch { case _: Exception => None }
 
     def paths(str: String, expandStar: Boolean): List[URL] =
       for {
diff --git a/src/compiler/scala/tools/nsc/Settings.scala b/src/compiler/scala/tools/nsc/Settings.scala
index 069fcf898e..23ceb37c95 100644
--- a/src/compiler/scala/tools/nsc/Settings.scala
+++ b/src/compiler/scala/tools/nsc/Settings.scala
@@ -272,20 +272,20 @@ class Settings(errorFn: String => Unit) extends ScalacSettings {
   /**
    *  The canonical creators for Setting objects.
    */
-  import Function.{ tupled, untupled }
+  import Function.{ untupled }
   import Setting._
 
   // A bit too clever, but I haven't found any other way to compose
   // functions with arity 2+ without having to annotate parameter types
-  lazy val IntSetting          = untupled(tupled(sint _) andThen add[IntSetting])
-  lazy val BooleanSetting      = untupled(tupled(bool _) andThen add[BooleanSetting])
-  lazy val StringSetting       = untupled(tupled(str _) andThen add[StringSetting])
-  lazy val MultiStringSetting  = untupled(tupled(multi _) andThen add[MultiStringSetting])
-  lazy val ChoiceSetting       = untupled(tupled(choice _) andThen add[ChoiceSetting])
-  lazy val DebugSetting        = untupled(tupled(sdebug _) andThen add[DebugSetting])
-  lazy val PhasesSetting       = untupled(tupled(phase _) andThen add[PhasesSetting])
+  lazy val IntSetting          = untupled((sint _).tuple andThen add[IntSetting])
+  lazy val BooleanSetting      = untupled((bool _).tuple andThen add[BooleanSetting])
+  lazy val StringSetting       = untupled((str _).tuple andThen add[StringSetting])
+  lazy val MultiStringSetting  = untupled((multi _).tuple andThen add[MultiStringSetting])
+  lazy val ChoiceSetting       = untupled((choice _).tuple andThen add[ChoiceSetting])
+  lazy val DebugSetting        = untupled((sdebug _).tuple andThen add[DebugSetting])
+  lazy val PhasesSetting       = untupled((phase _).tuple andThen add[PhasesSetting])
   lazy val DefinesSetting      = add(defines())
-  lazy val OutputSetting       = untupled(tupled(output _) andThen add[OutputSetting])
+  lazy val OutputSetting       = untupled((output _).tuple andThen add[OutputSetting])
 
   override def toString() =
     "Settings(\n%s)" format (settingSet filter (s => !s.isDefault) map ("  " + _ + "\n") mkString)
@@ -364,7 +364,7 @@ object Settings {
       singleOutDir match {
         case Some(d) => d
         case None =>
-          (outputs find Function.tupled(isBelow)) match {
+          (outputs find (isBelow _).tuple) match {
             case Some((_, d)) => d
             case _ =>
               throw new FatalError("Could not find an output directory for "
diff --git a/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala b/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala
index 90d0e2da61..fd4b57ef67 100644
--- a/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala
+++ b/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala
@@ -15,7 +15,6 @@ import collection._
 import mutable.ListBuffer
 import immutable.IntMap
 import annotation.elidable
-import Function.tupled
 
 trait ParallelMatching extends ast.TreeDSL
       with MatchSupport
@@ -583,7 +582,7 @@ trait ParallelMatching extends ast.TreeDSL
       }
 
       lazy val failure =
-        mkFail(remaining map tupled((p1, p2) => rest rows p1 insert p2))
+        mkFail(remaining map { case (p1, p2) => rest rows p1 insert p2 })
 
       final def tree(): Tree = codegen
     }
@@ -620,7 +619,7 @@ trait ParallelMatching extends ast.TreeDSL
         def isNotAlternative(p: Pattern) = !cond(p.tree) { case _: Alternative => true }
 
         // classify all the top level patterns - alternatives come back unaltered
-        val newPats: List[Pattern] = pats.zipWithIndex map tupled(classifyPat)
+        val newPats: List[Pattern] = pats.zipWithIndex map classifyPat.tuple
         // see if any alternatives were in there
         val (ps, others) = newPats span isNotAlternative
         // make a new row for each alternative, with it spliced into the original position
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index 1e021fe107..1c746d0ab9 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -1744,7 +1744,7 @@ trait Typers { self: Analyzer =>
       useCase.aliases = context.scope.toList
       namer.enterSyms(trees)
       typedStats(trees, NoSymbol)
-      useCase.defined = context.scope.toList -- useCase.aliases
+      useCase.defined = context.scope.toList filterNot (useCase.aliases contains _)
 //      println("defined use cases: "+(useCase.defined map (sym => sym+":"+sym.tpe)))
     }