miscellaneous cleanup, mostly fighting with feature warnings

12 files changed, 24 insertions, 20 deletions

diff --git a/src/compiler/scala/reflect/internal/BaseTypeSeqs.scala b/src/compiler/scala/reflect/internal/BaseTypeSeqs.scala
index 3753a45133..e07f1bac49 100644
--- a/src/compiler/scala/reflect/internal/BaseTypeSeqs.scala
+++ b/src/compiler/scala/reflect/internal/BaseTypeSeqs.scala
@@ -225,9 +225,9 @@ trait BaseTypeSeqs {
             nextRawElem(i) match {
               case RefinedType(variants, decls) =>
                 for (tp <- variants)
-                  if (!(minTypes exists (tp =:=))) minTypes = tp :: minTypes
+                  if (!(minTypes exists (tp =:= _))) minTypes = tp :: minTypes
               case tp =>
-                if (!(minTypes exists (tp =:=))) minTypes = tp :: minTypes
+                if (!(minTypes exists (tp =:= _))) minTypes = tp :: minTypes
             }
             index(i) = index(i) + 1
           }
@@ -252,7 +252,7 @@ trait BaseTypeSeqs {
     override def map(g: Type => Type) = lateMap(g)
     override def lateMap(g: Type => Type) = orig.lateMap(x => g(f(x)))
     override def exists(p: Type => Boolean) = elems exists (x => p(f(x)))
-    override protected def maxDepthOfElems: Int = elems map (x => maxDpth(f(x))) max
+    override protected def maxDepthOfElems: Int = (elems map (x => maxDpth(f(x)))).max
     override def toString = elems.mkString("MBTS(", ",", ")")
   }
 
diff --git a/src/compiler/scala/reflect/internal/Chars.scala b/src/compiler/scala/reflect/internal/Chars.scala
index f2c90a6721..50ec71094a 100644
--- a/src/compiler/scala/reflect/internal/Chars.scala
+++ b/src/compiler/scala/reflect/internal/Chars.scala
@@ -2,10 +2,12 @@
  * Copyright 2006-2011 LAMP/EPFL
  * @author  Martin Odersky
  */
-package scala.reflect.internal
+package scala.reflect
+package internal
 
 import annotation.{ tailrec, switch }
 import java.lang.{ Character => JCharacter }
+import language.postfixOps
 
 /** Contains constants and classifier methods for characters */
 trait Chars {
diff --git a/src/compiler/scala/reflect/internal/Definitions.scala b/src/compiler/scala/reflect/internal/Definitions.scala
index 3b32d475ce..d55b38224d 100644
--- a/src/compiler/scala/reflect/internal/Definitions.scala
+++ b/src/compiler/scala/reflect/internal/Definitions.scala
@@ -770,7 +770,7 @@ trait Definitions extends api.StandardDefinitions {
 
         existentialAbstraction(
           eparams,
-          ClassType(eparams.head setInfo TypeBounds.upper(upperBound) tpe)
+          ClassType((eparams.head setInfo TypeBounds.upper(upperBound)).tpe)
         )
       }
     }
diff --git a/src/compiler/scala/reflect/internal/Importers.scala b/src/compiler/scala/reflect/internal/Importers.scala
index 72b6288d87..431d9819a5 100644
--- a/src/compiler/scala/reflect/internal/Importers.scala
+++ b/src/compiler/scala/reflect/internal/Importers.scala
@@ -417,17 +417,17 @@ trait Importers { self: SymbolTable =>
       }
       addFixup({
         if (mytree != null) {
-          val mysym = if (tree hasSymbol) importSymbol(tree.symbol) else NoSymbol
+          val mysym = if (tree.hasSymbol) importSymbol(tree.symbol) else NoSymbol
           val mytpe = importType(tree.tpe)
 
           mytree match {
             case mytt: TypeTree =>
               val tt = tree.asInstanceOf[from.TypeTree]
-              if (mytree hasSymbol) mytt.symbol = mysym
+              if (mytree.hasSymbol) mytt.symbol = mysym
               if (tt.wasEmpty) mytt.defineType(mytpe) else mytt.setType(mytpe)
               if (tt.original != null) mytt.setOriginal(importTree(tt.original))
             case _ =>
-              if (mytree hasSymbol) mytree.symbol = importSymbol(tree.symbol)
+              if (mytree.hasSymbol) mytree.symbol = importSymbol(tree.symbol)
               mytree.tpe = importType(tree.tpe)
           }
         }
diff --git a/src/compiler/scala/reflect/internal/StdAttachments.scala b/src/compiler/scala/reflect/internal/StdAttachments.scala
index df1a1267de..4ea9b27da9 100644
--- a/src/compiler/scala/reflect/internal/StdAttachments.scala
+++ b/src/compiler/scala/reflect/internal/StdAttachments.scala
@@ -1,8 +1,6 @@
 package scala.reflect
 package internal
 
-import scala.reflect.makro.runtime.{Context => MacroContext}
-
 trait StdAttachments {
   self: SymbolTable =>
 
diff --git a/src/compiler/scala/reflect/internal/StdNames.scala b/src/compiler/scala/reflect/internal/StdNames.scala
index 0e5f3efb49..6f68b8f63a 100644
--- a/src/compiler/scala/reflect/internal/StdNames.scala
+++ b/src/compiler/scala/reflect/internal/StdNames.scala
@@ -72,7 +72,7 @@ trait StdNames {
       val cs = s.toArray
       val bytes = Codec toUTF8 cs
       md5 update bytes
-      val md5chars = md5.digest() map (b => (b & 0xFF).toHexString) mkString
+      val md5chars = (md5.digest() map (b => (b & 0xFF).toHexString)).mkString
 
       prefix + marker + md5chars + marker + suffix
     }
@@ -262,10 +262,10 @@ trait StdNames {
     final val SourceFileATTR: NameType             = "SourceFile"
     final val SyntheticATTR: NameType              = "Synthetic"
 
-    def dropSingletonName(name: Name): TypeName = name dropRight SINGLETON_SUFFIX.length toTypeName
-    def singletonName(name: Name): TypeName     = name append SINGLETON_SUFFIX toTypeName
-    def implClassName(name: Name): TypeName     = name append IMPL_CLASS_SUFFIX toTypeName
-    def interfaceName(implname: Name): TypeName = implname dropRight IMPL_CLASS_SUFFIX.length toTypeName
+    def dropSingletonName(name: Name): TypeName = (name dropRight SINGLETON_SUFFIX.length).toTypeName
+    def singletonName(name: Name): TypeName     = (name append SINGLETON_SUFFIX).toTypeName
+    def implClassName(name: Name): TypeName     = (name append IMPL_CLASS_SUFFIX).toTypeName
+    def interfaceName(implname: Name): TypeName = (implname dropRight IMPL_CLASS_SUFFIX.length).toTypeName
   }
 
   abstract class TermNames extends Keywords with TermNamesApi {
diff --git a/src/compiler/scala/reflect/internal/Symbols.scala b/src/compiler/scala/reflect/internal/Symbols.scala
index 7305cdaf16..86693cf880 100644
--- a/src/compiler/scala/reflect/internal/Symbols.scala
+++ b/src/compiler/scala/reflect/internal/Symbols.scala
@@ -1667,7 +1667,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
      *  The empty list for all other classes.
      */
     final def caseFieldAccessors: List[Symbol] =
-      info.decls filter (_.isCaseAccessorMethod) toList
+      (info.decls filter (_.isCaseAccessorMethod)).toList
 
     final def constrParamAccessors: List[Symbol] =
       info.decls.toList filter (sym => !sym.isMethod && sym.isParamAccessor)
@@ -1730,7 +1730,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
      */
     def mixinClasses: List[Symbol] = {
       val sc = superClass
-      ancestors takeWhile (sc ne)
+      ancestors takeWhile (sc ne _)
     }
 
     /** All directly or indirectly inherited classes. */
@@ -1994,7 +1994,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
      *  pre: `this.owner` is in the base class sequence of `base`.
      */
     final def superSymbol(base: Symbol): Symbol = {
-      var bcs = base.info.baseClasses.dropWhile(owner !=).tail
+      var bcs = base.info.baseClasses.dropWhile(owner != _).tail
       var sym: Symbol = NoSymbol
       while (!bcs.isEmpty && sym == NoSymbol) {
         if (!bcs.head.isImplClass)
diff --git a/src/compiler/scala/reflect/internal/TypeDebugging.scala b/src/compiler/scala/reflect/internal/TypeDebugging.scala
index 85a1767067..33f6a645e8 100644
--- a/src/compiler/scala/reflect/internal/TypeDebugging.scala
+++ b/src/compiler/scala/reflect/internal/TypeDebugging.scala
@@ -24,7 +24,7 @@ trait TypeDebugging {
     def ptBlock(label: String, pairs: (String, Any)*): String = {
       if (pairs.isEmpty) label + "{ }"
       else {
-        val width = pairs map (_._1.length) max
+        val width = (pairs map (_._1.length)).max
         val fmt   = "%-" + (width + 1) + "s %s"
         val strs  = pairs map { case (k, v) => fmt.format(k, to_s(v)) }
 
diff --git a/src/compiler/scala/reflect/internal/Types.scala b/src/compiler/scala/reflect/internal/Types.scala
index ce7a697439..ada998bf9e 100644
--- a/src/compiler/scala/reflect/internal/Types.scala
+++ b/src/compiler/scala/reflect/internal/Types.scala
@@ -14,6 +14,7 @@ import Flags._
 import scala.util.control.ControlThrowable
 import scala.annotation.tailrec
 import util.Statistics._
+import language.postfixOps
 
 /* A standard type pattern match:
   case ErrorType =>
diff --git a/src/compiler/scala/reflect/internal/pickling/UnPickler.scala b/src/compiler/scala/reflect/internal/pickling/UnPickler.scala
index bfccdd3988..757163a074 100644
--- a/src/compiler/scala/reflect/internal/pickling/UnPickler.scala
+++ b/src/compiler/scala/reflect/internal/pickling/UnPickler.scala
@@ -358,7 +358,7 @@ abstract class UnPickler /*extends reflect.generic.UnPickler*/ {
         case POLYtpe =>
           val restpe = readTypeRef()
           val typeParams = until(end, readSymbolRef)
-          if(typeParams nonEmpty) {
+          if (typeParams.nonEmpty) {
             // NMT_TRANSITION: old class files denoted a polymorphic nullary method as PolyType(tps, restpe), we now require PolyType(tps, NullaryMethodType(restpe))
             // when a type of kind * is expected (forceProperType is true), we know restpe should be wrapped in a NullaryMethodType (if it wasn't suitably wrapped yet)
             def transitionNMT(restpe: Type) = {
diff --git a/src/compiler/scala/reflect/internal/transform/Transforms.scala b/src/compiler/scala/reflect/internal/transform/Transforms.scala
index a7cc99ba3b..c4c5dc3a1c 100644
--- a/src/compiler/scala/reflect/internal/transform/Transforms.scala
+++ b/src/compiler/scala/reflect/internal/transform/Transforms.scala
@@ -2,6 +2,8 @@ package scala.reflect
 package internal
 package transform
 
+import language.existentials
+
 trait Transforms { self: SymbolTable =>
 
   /** We need to encode laziness by hand here because the three components refChecks, uncurry and erasure
diff --git a/src/compiler/scala/reflect/internal/util/TraceSymbolActivity.scala b/src/compiler/scala/reflect/internal/util/TraceSymbolActivity.scala
index d8c53c0162..5fbeb5f576 100644
--- a/src/compiler/scala/reflect/internal/util/TraceSymbolActivity.scala
+++ b/src/compiler/scala/reflect/internal/util/TraceSymbolActivity.scala
@@ -2,6 +2,7 @@ package scala.reflect.internal
 package util
 
 import scala.collection.{ mutable, immutable }
+import language.postfixOps
 
 trait TraceSymbolActivity {
   val global: SymbolTable