Another round of deprecation warning elimination.

1 files changed, 10 insertions, 10 deletions

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 "