Eliminated 2500 lines of whitespace changes.

21 files changed, 478 insertions, 478 deletions

diff --git a/src/compiler/scala/reflect/internal/Definitions.scala b/src/compiler/scala/reflect/internal/Definitions.scala
index 7d31537e7a..f8342444c8 100644
--- a/src/compiler/scala/reflect/internal/Definitions.scala
+++ b/src/compiler/scala/reflect/internal/Definitions.scala
@@ -166,7 +166,7 @@ trait Definitions extends reflect.api.StandardDefinitions {
 
     lazy val RuntimePackage       = getRequiredModule("scala.runtime")
     lazy val RuntimePackageClass  = RuntimePackage.moduleClass
-
+    
     lazy val JavaLangEnumClass = getRequiredClass("java.lang.Enum")
 
     // convenient one-argument parameter lists
@@ -178,10 +178,10 @@ trait Definitions extends reflect.api.StandardDefinitions {
     private def booltype    = BooleanClass.typeConstructor
     private def inttype     = IntClass.typeConstructor
     private def stringtype  = StringClass.typeConstructor
-
+    
     // Java types
     def javaTypeName(jclazz: Class[_]): TypeName = newTypeName(jclazz.getName)
-
+    
     def javaTypeToValueClass(jtype: Class[_]): Symbol = jtype match {
       case java.lang.Void.TYPE      => UnitClass
       case java.lang.Byte.TYPE      => ByteClass
@@ -274,7 +274,7 @@ trait Definitions extends reflect.api.StandardDefinitions {
       def Predef_identity = getMember(PredefModule, nme.identity)
       def Predef_conforms = getMember(PredefModule, nme.conforms)
       def Predef_wrapRefArray = getMember(PredefModule, nme.wrapRefArray)
-
+      
     /** Is `sym` a member of Predef with the given name?
      *  Note: DON't replace this by sym == Predef_conforms/etc, as Predef_conforms is a `def`
      *  which does a member lookup (it can't be a lazy val because we might reload Predef
@@ -496,7 +496,7 @@ trait Definitions extends reflect.api.StandardDefinitions {
       case DoubleClass  => nme.wrapDoubleArray
       case BooleanClass => nme.wrapBooleanArray
       case UnitClass    => nme.wrapUnitArray
-      case _        =>
+      case _        => 
         if ((elemtp <:< AnyRefClass.tpe) && !isPhantomClass(elemtp.typeSymbol)) nme.wrapRefArray
         else nme.genericWrapArray
     }
@@ -640,7 +640,7 @@ trait Definitions extends reflect.api.StandardDefinitions {
         case _ => false
       })
     }
-
+    
     // members of class scala.Any
     lazy val Any_==       = enterNewMethod(AnyClass, nme.EQ, anyparam, booltype, FINAL)
     lazy val Any_!=       = enterNewMethod(AnyClass, nme.NE, anyparam, booltype, FINAL)
@@ -816,10 +816,10 @@ trait Definitions extends reflect.api.StandardDefinitions {
       while (result.isAliasType) result = result.info.typeSymbol
       result
     }
-
+    
     def getRequiredModule(fullname: String): Symbol =
       getModule(newTermNameCached(fullname))
-    def getRequiredClass(fullname: String): Symbol =
+    def getRequiredClass(fullname: String): Symbol = 
       getClass(newTypeNameCached(fullname))
 
     def getClassIfDefined(fullname: String): Symbol =
@@ -993,7 +993,7 @@ trait Definitions extends reflect.api.StandardDefinitions {
 
       RootClass.info.decls enter EmptyPackage
       RootClass.info.decls enter RootPackage
-
+      
       val forced = List( // force initialization of every symbol that is entered as a side effect
         AnnotationDefaultAttr, // #2264
         RepeatedParamClass,
diff --git a/src/compiler/scala/reflect/internal/Symbols.scala b/src/compiler/scala/reflect/internal/Symbols.scala
index 92c896d30b..e504cea8cf 100644
--- a/src/compiler/scala/reflect/internal/Symbols.scala
+++ b/src/compiler/scala/reflect/internal/Symbols.scala
@@ -17,7 +17,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
   import definitions._
 
   protected var ids = 0
-
+  
   val emptySymbolArray = new Array[Symbol](0)
 
   def symbolCount = ids // statistics
@@ -38,14 +38,14 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
     nextexid += 1
     newTypeName("_" + nextexid + suffix)
   }
-
+  
   // Set the fields which point companions at one another.  Returns the module.
   def connectModuleToClass(m: ModuleSymbol, moduleClass: ClassSymbol): ModuleSymbol = {
     moduleClass.sourceModule = m
     m setModuleClass moduleClass
     m
   }
-
+  
   /** Create a new free variable.  Its owner is NoSymbol.
    */
   def newFreeVar(name: TermName, tpe: Type, value: Any, newFlags: Long = 0L): FreeVar =
@@ -84,19 +84,19 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
     private[this] var _rawowner = initOwner // Syncnote: need not be protected, as only assignment happens in owner_=, which is not exposed to api
     private[this] var _rawname  = initName
     private[this] var _rawflags = 0L
-
+    
     def rawowner = _rawowner
     def rawname = _rawname
     def rawflags = _rawflags
-
+    
     protected def rawflags_=(x: FlagsType) { _rawflags = x }
-
+    
     private var rawpos = initPos
-
+    
     val id = nextId() // identity displayed when -uniqid
 
     private[this] var _validTo: Period = NoPeriod
-
+    
     def validTo = _validTo
     def validTo_=(x: Period) { _validTo = x}
 
@@ -169,10 +169,10 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
      */
     def newTermSymbol(name: TermName, pos: Position = NoPosition, newFlags: Long = 0L): TermSymbol =
       new TermSymbol(this, pos, name) initFlags newFlags
-
+  
     def newAbstractTypeSymbol(name: TypeName, pos: Position = NoPosition, newFlags: Long = 0L): AbstractTypeSymbol =
       new AbstractTypeSymbol(this, pos, name) initFlags newFlags
-
+    
     def newAliasTypeSymbol(name: TypeName, pos: Position = NoPosition, newFlags: Long = 0L): AliasTypeSymbol =
       new AliasTypeSymbol(this, pos, name) initFlags newFlags
 
@@ -184,10 +184,10 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
 
     def newClassSymbol(name: TypeName, pos: Position = NoPosition, newFlags: Long = 0L): ClassSymbol =
       new ClassSymbol(this, pos, name) initFlags newFlags
-
+      
     def newModuleClassSymbol(name: TypeName, pos: Position = NoPosition, newFlags: Long = 0L): ModuleClassSymbol =
       new ModuleClassSymbol(this, pos, name) initFlags newFlags
-
+  
     /** Derive whether it is an abstract type from the flags; after creation
      *  the DEFERRED flag will be ignored.
      */
@@ -196,7 +196,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
         newAliasTypeSymbol(name, pos, newFlags)
       else
         newAbstractTypeSymbol(name, pos, newFlags)
-
+    
     def newTypeSkolemSymbol(name: TypeName, origin: AnyRef, pos: Position = NoPosition, newFlags: Long = 0L): TypeSkolem =
       if ((newFlags & DEFERRED) == 0L)
         new TypeSkolem(this, pos, name, origin) initFlags newFlags
@@ -233,7 +233,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
      */
     final def newAliasType(name: TypeName, pos: Position = NoPosition, newFlags: Long = 0L): Symbol =
       newAliasTypeSymbol(name, pos, newFlags)
-
+      
     /** Symbol of an abstract type  type T >: ... <: ...
      */
     final def newAbstractType(name: TypeName, pos: Position = NoPosition, newFlags: Long = 0L): Symbol =
@@ -292,7 +292,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
 
     final def newClass(name: TypeName, pos: Position = NoPosition, newFlags: Long = 0L) =
       newClassSymbol(name, pos, newFlags)
-
+    
     /** A new class with its info set to a ClassInfoType with given scope and parents. */
     def newClassWithInfo(name: TypeName, parents: List[Type], scope: Scope, pos: Position = NoPosition, newFlags: Long = 0L) = {
       val clazz = newClass(name, pos, newFlags)
@@ -344,9 +344,9 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
     def newAliasType(pos: Position, name: TypeName): Symbol    = newAliasType(name, pos)
     @deprecated("Use the other signature", "2.10.0")
     def newAbstractType(pos: Position, name: TypeName): Symbol = newAbstractType(name, pos)
-    @deprecated("Use the other signature", "2.10.0")
+    @deprecated("Use the other signature", "2.10.0")  
     def newExistential(pos: Position, name: TypeName): Symbol  = newExistential(name, pos)
-    @deprecated("Use the other signature", "2.10.0")
+    @deprecated("Use the other signature", "2.10.0")  
     def newMethod(pos: Position, name: TermName): MethodSymbol = newMethod(name, pos)
 
 // ----- locking and unlocking ------------------------------------------------------
@@ -830,7 +830,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
 
     private def addModuleSuffix(n: Name): Name =
       if (needsModuleSuffix) n append nme.MODULE_SUFFIX_STRING else n
-
+    
     def moduleSuffix: String = (
       if (needsModuleSuffix) nme.MODULE_SUFFIX_STRING
       else ""
@@ -838,7 +838,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
     /** Whether this symbol needs nme.MODULE_SUFFIX_STRING (aka $) appended on the java platform.
      */
     def needsModuleSuffix = (
-         hasModuleFlag
+         hasModuleFlag 
       && !isMethod
       && !isImplClass
       && !isJavaDefined
@@ -865,7 +865,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
       else if (owner.isEffectiveRoot) name
       else effectiveOwner.enclClass.fullNameAsName(separator) append separator append name
     )
-
+    
     def fullNameAsName(separator: Char): Name = nme.dropLocalSuffix(fullNameInternal(separator))
 
     /** The encoded full path name of this symbol, where outer names and inner names
@@ -1017,7 +1017,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
     /** Substitute second list of symbols for first in current info. */
     def substInfo(syms0: List[Symbol], syms1: List[Symbol]) = modifyInfo(_.substSym(syms0, syms1))
     def setInfoOwnerAdjusted(info: Type): this.type         = setInfo(info atOwner this)
-
+    
     /** Set the info and enter this symbol into the owner's scope. */
     def setInfoAndEnter(info: Type): this.type = {
       setInfo(info)
@@ -1319,7 +1319,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
      */
     final def isNestedIn(that: Symbol): Boolean =
       owner == that || owner != NoSymbol && (owner isNestedIn that)
-
+      
     /** Is this class symbol a subclass of that symbol,
      *  and is this class symbol also different from Null or Nothing? */
     def isNonBottomSubClass(that: Symbol): Boolean = false
@@ -2119,7 +2119,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
 
     def referenced: Symbol = _referenced
     def referenced_=(x: Symbol) { _referenced = x }
-
+        
     def existentialBound = singletonBounds(this.tpe)
 
     def cloneSymbolImpl(owner: Symbol, newFlags: Long): Symbol =
@@ -2213,7 +2213,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
       if (!isMethod && needsFlatClasses) {
         if (flatname eq null)
           flatname = nme.flattenedName(rawowner.name, rawname)
-
+        
         flatname
       }
       else rawname.toTermName
@@ -2249,7 +2249,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
       res
     }
   }
-
+  
   class AliasTypeSymbol protected[Symbols] (initOwner: Symbol, initPos: Position, initName: TypeName)
   extends TypeSymbol(initOwner, initPos, initName) {
     // Temporary programmatic help tracking down who might do such a thing
@@ -2264,13 +2264,13 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
     override def cloneSymbolImpl(owner: Symbol, newFlags: Long): AliasTypeSymbol =
       owner.newAliasTypeSymbol(name, pos, newFlags)
   }
-
+  
   class AbstractTypeSymbol(initOwner: Symbol, initPos: Position, initName: TypeName)
   extends TypeSymbol(initOwner, initPos, initName) with AbstractTypeMixin {
     override def cloneSymbolImpl(owner: Symbol, newFlags: Long): AbstractTypeSymbol =
       owner.newAbstractTypeSymbol(name, pos, newFlags)
   }
-
+  
   /** Might be mixed into TypeSymbol or TypeSkolem.
    */
   trait AbstractTypeMixin extends TypeSymbol {
@@ -2468,7 +2468,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
     final override def isNonClassType = false
     final override def isAbstractType = false
     final override def isAliasType = false
-
+    
     override def existentialBound = GenPolyType(this.typeParams, TypeBounds.upper(this.classBound))
 
     override def sourceFile =
@@ -2496,19 +2496,19 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
       }
       thisTypeCache
     }
-
+    
     override def owner: Symbol =
       if (needsFlatClasses) rawowner.owner else rawowner
     override def name: TypeName = (
       if (needsFlatClasses) {
         if (flatname eq null)
           flatname = nme.flattenedName(rawowner.name, rawname).toTypeName
-
+          
         flatname
       }
       else rawname.toTypeName
     )
-
+    
     /** A symbol carrying the self type of the class as its type */
     override def thisSym: Symbol = thissym
 
@@ -2691,7 +2691,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
     val syms1 = cloneSymbolsAtOwner(syms, owner)
     creator(syms1, tpe.substSym(syms, syms1))
   }
-
+  
   /** A deep map on a symbol's paramss.
    */
   def mapParamss[T](sym: Symbol)(f: Symbol => T): List[List[T]] = mmap(sym.info.paramss)(f)
diff --git a/src/compiler/scala/reflect/internal/TreePrinters.scala b/src/compiler/scala/reflect/internal/TreePrinters.scala
index aaee72f644..e7ba0c793d 100644
--- a/src/compiler/scala/reflect/internal/TreePrinters.scala
+++ b/src/compiler/scala/reflect/internal/TreePrinters.scala
@@ -249,17 +249,17 @@ trait TreePrinters extends api.TreePrinters { self: SymbolTable =>
             print("AnyVal")
           }
           else {
-            printRow(parents, " with ")
-            if (!body.isEmpty) {
-              if (self.name != nme.WILDCARD) {
-                print(" { ", self.name); printOpt(": ", self.tpt); print(" => ")
-              } else if (!self.tpt.isEmpty) {
-                print(" { _ : ", self.tpt, " => ")
-              } else {
-                print(" {")
-              }
-              printColumn(body, "", ";", "}")
+          printRow(parents, " with ")
+          if (!body.isEmpty) {
+            if (self.name != nme.WILDCARD) {
+              print(" { ", self.name); printOpt(": ", self.tpt); print(" => ")
+            } else if (!self.tpt.isEmpty) {
+              print(" { _ : ", self.tpt, " => ")
+            } else {
+              print(" {")
             }
+            printColumn(body, "", ";", "}")
+          }
           }
           currentOwner = currentOwner1
 
diff --git a/src/compiler/scala/reflect/internal/Trees.scala b/src/compiler/scala/reflect/internal/Trees.scala
index 50929ecc32..3c339ad8e2 100644
--- a/src/compiler/scala/reflect/internal/Trees.scala
+++ b/src/compiler/scala/reflect/internal/Trees.scala
@@ -10,7 +10,7 @@ import Flags._
 import api.Modifier
 
 trait Trees extends api.Trees { self: SymbolTable =>
-  
+
   // Belongs in TreeInfo but then I can't reach it from TreePrinters.
   def isReferenceToScalaMember(t: Tree, Id: Name) = t match {
     case Ident(Id)                                          => true
@@ -133,7 +133,7 @@ trait Trees extends api.Trees { self: SymbolTable =>
         new ChangeOwnerTraverser(oldOwner, newOwner) apply t
       }
     }
-
+    
     def substTreeSyms(pairs: (Symbol, Symbol)*): Tree =
       substTreeSyms(pairs.map(_._1).toList, pairs.map(_._2).toList)
 
diff --git a/src/compiler/scala/reflect/internal/Types.scala b/src/compiler/scala/reflect/internal/Types.scala
index 5fa03eab3c..49ac205409 100644
--- a/src/compiler/scala/reflect/internal/Types.scala
+++ b/src/compiler/scala/reflect/internal/Types.scala
@@ -110,13 +110,13 @@ trait Types extends api.Types { self: SymbolTable =>
    *  to undo constraints in the case of isSubType/isSameType failure.
    */
   lazy val undoLog = newUndoLog
-
+  
   protected def newUndoLog = new UndoLog
-
+  
   class UndoLog {
     private type UndoPairs = List[(TypeVar, TypeConstraint)]
     private var log: UndoPairs = List()
-
+    
     // register with the auto-clearing cache manager
     perRunCaches.recordCache(this)
 
@@ -136,7 +136,7 @@ trait Types extends api.Types { self: SymbolTable =>
     private[reflect] def record(tv: TypeVar) = {
       log ::= ((tv, tv.constr.cloneInternal))
     }
-
+    
     private[scala] def clear() {
       if (settings.debug.value)
         self.log("Clearing " + log.size + " entries from the undoLog.")
@@ -427,7 +427,7 @@ trait Types extends api.Types { self: SymbolTable =>
 
     /** For a typeref, its arguments. The empty list for all other types */
     def typeArgs: List[Type] = List()
-
+    
     /** A list of placeholder types derived from the type parameters.
      *  Used by RefinedType and TypeRef.
      */
@@ -524,7 +524,7 @@ trait Types extends api.Types { self: SymbolTable =>
      *  Alternatives of overloaded symbol appear in the order they are declared.
      */
     def decl(name: Name): Symbol = findDecl(name, 0)
-
+    
     /** A list of all non-private members defined or declared in this type. */
     def nonPrivateDecls: List[Symbol] = decls filter (x => !x.isPrivate) toList
 
@@ -565,7 +565,7 @@ trait Types extends api.Types { self: SymbolTable =>
      */
     def nonPrivateMember(name: Name): Symbol =
       memberBasedOnName(name, BridgeAndPrivateFlags)
-
+      
     /** All members with the given flags, excluding bridges.
      */
     def membersWithFlags(requiredFlags: Long): List[Symbol] =
@@ -590,7 +590,7 @@ trait Types extends api.Types { self: SymbolTable =>
      *  an OverloadedSymbol if several exist, NoSymbol if none exist */
     def nonLocalMember(name: Name): Symbol =
       memberBasedOnName(name, BridgeFlags | LOCAL)
-
+    
     /** Members excluding and requiring the given flags.
      *  Note: unfortunately it doesn't work to exclude DEFERRED this way.
      */
@@ -1236,7 +1236,7 @@ trait Types extends api.Types { self: SymbolTable =>
     private[reflect] var underlyingPeriod = NoPeriod
     override def underlying: Type = {
       val cache = underlyingCache
-      if (underlyingPeriod == currentPeriod && cache != null) cache
+      if (underlyingPeriod == currentPeriod && cache != null) cache 
       else {
         defineUnderlyingOfSingleType(this)
         underlyingCache
@@ -1279,7 +1279,7 @@ trait Types extends api.Types { self: SymbolTable =>
       unique(new UniqueSingleType(pre, sym))
     }
   }
-
+  
   protected def defineUnderlyingOfSingleType(tpe: SingleType) = {
     val period = tpe.underlyingPeriod
     if (period != currentPeriod) {
@@ -1349,13 +1349,13 @@ trait Types extends api.Types { self: SymbolTable =>
 
     override def baseTypeSeq: BaseTypeSeq = {
       val cached = baseTypeSeqCache
-      if (baseTypeSeqPeriod == currentPeriod && cached != null && cached != undetBaseTypeSeq)
+      if (baseTypeSeqPeriod == currentPeriod && cached != null && cached != undetBaseTypeSeq) 
         cached
       else {
         defineBaseTypeSeqOfCompoundType(this)
         if (baseTypeSeqCache eq undetBaseTypeSeq)
           throw new RecoverableCyclicReference(typeSymbol)
-
+        
         baseTypeSeqCache
       }
     }
@@ -1369,7 +1369,7 @@ trait Types extends api.Types { self: SymbolTable =>
         defineBaseClassesOfCompoundType(this)
         if (baseClassesCache eq null)
           throw new RecoverableCyclicReference(typeSymbol)
-
+        
         baseClassesCache
       }
     }
@@ -1415,7 +1415,7 @@ trait Types extends api.Types { self: SymbolTable =>
       (if (settings.debug.value || parents.isEmpty || (decls.elems ne null))
         decls.mkString("{", "; ", "}") else "")
   }
-
+  
   protected def defineBaseTypeSeqOfCompoundType(tpe: CompoundType) = {
     val period = tpe.baseTypeSeqPeriod
     if (period != currentPeriod) {
@@ -1468,7 +1468,7 @@ trait Types extends api.Types { self: SymbolTable =>
     if (tpe.baseTypeSeqCache eq undetBaseTypeSeq)
       throw new TypeError("illegal cyclic inheritance involving " + tpe.typeSymbol)
   }
-
+  
   protected def defineBaseClassesOfCompoundType(tpe: CompoundType) = {
     def computeBaseClasses: List[Symbol] =
       if (tpe.parents.isEmpty) List(tpe.typeSymbol)
@@ -1787,13 +1787,13 @@ trait Types extends api.Types { self: SymbolTable =>
     }
   }
 
-  /* Syncnote: The `volatile` var and `pendingVolatiles` mutable set need not be protected
+  /* Syncnote: The `volatile` var and `pendingVolatiles` mutable set need not be protected 
    * with synchronized, because they are accessed only from isVolatile, which is called only from
    * Typer.
    */
   private var volatileRecursions: Int = 0
   private val pendingVolatiles = new mutable.HashSet[Symbol]
-
+  
   class ArgsTypeRef(pre0: Type, sym0: Symbol, args0: List[Type]) extends TypeRef(pre0, sym0, args0) with UniqueType {
     require(args0.nonEmpty, this)
 
@@ -1811,7 +1811,7 @@ trait Types extends api.Types { self: SymbolTable =>
 
       asSeenFromOwner(tp).instantiateTypeParams(sym.typeParams, args)
     }
-
+    
     // note: does not go through typeRef. There's no need to because
     // neither `pre` nor `sym` changes.  And there's a performance
     // advantage to call TypeRef directly.
@@ -1826,7 +1826,7 @@ trait Types extends api.Types { self: SymbolTable =>
     override def isHigherKinded = typeParams.nonEmpty
     override def typeParams     = if (isDefinitionsInitialized) sym.typeParams else sym.unsafeTypeParams
     private def isRaw           = !phase.erasedTypes && isRawIfWithoutArgs(sym)
-
+    
     override def instantiateTypeParams(formals: List[Symbol], actuals: List[Type]): Type =
       if (isHigherKinded) {
         if (sameLength(formals intersect typeParams, typeParams))
@@ -1846,9 +1846,9 @@ trait Types extends api.Types { self: SymbolTable =>
         res
     }
 
-    override def transformInfo(tp: Type): Type =
+    override def transformInfo(tp: Type): Type = 
       appliedType(asSeenFromOwner(tp), dummyArgs)
-
+      
     override def narrow =
       if (sym.isModuleClass) singleType(pre, sym.sourceModule)
       else super.narrow
@@ -1856,14 +1856,14 @@ trait Types extends api.Types { self: SymbolTable =>
     override def typeConstructor = this
     // eta-expand, subtyping relies on eta-expansion of higher-kinded types
 
-    override protected def normalizeImpl: Type =
+    override protected def normalizeImpl: Type = 
       if (isHigherKinded) etaExpand else super.normalizeImpl
   }
-
+  
   trait ClassTypeRef extends TypeRef {
     // !!! There are scaladoc-created symbols arriving which violate this require.
     // require(sym.isClass, sym)
-
+    
     override protected def normalizeImpl: Type =
       if (sym.isRefinementClass) sym.info.normalize // I think this is okay, but see #1241 (r12414), #2208, and typedTypeConstructor in Typers
       else super.normalizeImpl
@@ -1872,7 +1872,7 @@ trait Types extends api.Types { self: SymbolTable =>
       if (sym == clazz) this
       else transform(sym.info.baseType(clazz))
   }
-
+  
   trait NonClassTypeRef extends TypeRef {
     require(sym.isNonClassType, sym)
 
@@ -1891,11 +1891,11 @@ trait Types extends api.Types { self: SymbolTable =>
       }
       relativeInfoCache
     }
-
+    
     override def baseType(clazz: Symbol): Type =
       if (sym == clazz) this else baseTypeOfNonClassTypeRef(this, clazz)
   }
-
+  
   protected def baseTypeOfNonClassTypeRef(tpe: NonClassTypeRef, clazz: Symbol) = try {
     basetypeRecursions += 1
     if (basetypeRecursions < LogPendingBaseTypesThreshold)
@@ -1912,7 +1912,7 @@ trait Types extends api.Types { self: SymbolTable =>
   } finally {
     basetypeRecursions -= 1
   }
-
+  
   trait AliasTypeRef extends NonClassTypeRef {
     require(sym.isAliasType, sym)
 
@@ -1930,7 +1930,7 @@ trait Types extends api.Types { self: SymbolTable =>
       if (typeParamsMatchArgs) betaReduce.normalize
       else if (isHigherKinded) super.normalizeImpl
       else ErrorType
-
+    
     // isHKSubType0 introduces synthetic type params so that
     // betaReduce can first apply sym.info to typeArgs before calling
     // asSeenFrom.  asSeenFrom then skips synthetic type params, which
@@ -1940,7 +1940,7 @@ trait Types extends api.Types { self: SymbolTable =>
     // this crashes pos/depmet_implicit_tpbetareduce.scala
     // appliedType(sym.info, typeArgs).asSeenFrom(pre, sym.owner)
     def betaReduce = transform(sym.info.resultType)
-
+    
     // #3731: return sym1 for which holds: pre bound sym.name to sym and
     // pre1 now binds sym.name to sym1, conceptually exactly the same
     // symbol as sym.  The selection of sym on pre must be updated to the
@@ -1954,12 +1954,12 @@ trait Types extends api.Types { self: SymbolTable =>
         // TODO: is there another way a typeref's symbol can refer to a symbol defined in its pre?
         case _                                           => sym
       }
-
+    
   }
 
   trait AbstractTypeRef extends NonClassTypeRef {
     require(sym.isAbstractType, sym)
-
+    
     /** Syncnote: Pure performance caches; no need to synchronize in multi-threaded environment
      */
     private var symInfoCache: Type = _
@@ -1988,7 +1988,7 @@ trait Types extends api.Types { self: SymbolTable =>
         volatileRecursions -= 1
       }
     }
-
+    
     override def thisInfo   = {
       val symInfo = sym.info
       if (thisInfoCache == null || (symInfo ne symInfoCache)) {
@@ -2021,7 +2021,7 @@ trait Types extends api.Types { self: SymbolTable =>
     private[reflect] var parentsPeriod                 = NoPeriod
     private[reflect] var baseTypeSeqCache: BaseTypeSeq = _
     private[reflect] var baseTypeSeqPeriod             = NoPeriod
-    private var normalized: Type                       = _
+    private var normalized: Type                       = _ 
 
     // @M: propagate actual type params (args) to `tp`, by replacing
     // formal type parameters with actual ones. If tp is higher kinded,
@@ -2043,7 +2043,7 @@ trait Types extends api.Types { self: SymbolTable =>
         normalized
       }
     }
-
+    
     def etaExpand: Type = {
       // must initialise symbol, see test/files/pos/ticket0137.scala
       val tpars = initializedTypeParams
@@ -2097,12 +2097,12 @@ trait Types extends api.Types { self: SymbolTable =>
       }
       thisInfo.decls
     }
-
+  
     protected[Types] def baseTypeSeqImpl: BaseTypeSeq = sym.info.baseTypeSeq map transform
 
     override def baseTypeSeq: BaseTypeSeq = {
       val cache = baseTypeSeqCache
-      if (baseTypeSeqPeriod == currentPeriod && cache != null && cache != undetBaseTypeSeq)
+      if (baseTypeSeqPeriod == currentPeriod && cache != null && cache != undetBaseTypeSeq) 
         cache
       else {
         defineBaseTypeSeqOfTypeRef(this)
@@ -2196,7 +2196,7 @@ trait Types extends api.Types { self: SymbolTable =>
       }
     })
   }
-
+  
   protected def defineParentsOfTypeRef(tpe: TypeRef) = {
     val period = tpe.parentsPeriod
     if (period != currentPeriod) {
@@ -2208,7 +2208,7 @@ trait Types extends api.Types { self: SymbolTable =>
       }
     }
   }
-
+  
   protected def defineBaseTypeSeqOfTypeRef(tpe: TypeRef) = {
     val period = tpe.baseTypeSeqPeriod
     if (period != currentPeriod) {
@@ -2368,7 +2368,7 @@ trait Types extends api.Types { self: SymbolTable =>
   }
 
   object PolyType extends PolyTypeExtractor
-
+  
   /** A creator for existential types which flattens nested existentials.
    */
   def newExistentialType(quantified: List[Symbol], underlying: Type): Type =
@@ -2571,7 +2571,7 @@ trait Types extends api.Types { self: SymbolTable =>
         else if (args.isEmpty)                new HKTypeVar(origin, constr, params)
         else throw new Error("Invalid TypeVar construction: " + ((origin, constr, args, params)))
       )
-
+      
       trace("create", "In " + tv.originLocation)(tv)
     }
   }
@@ -2612,7 +2612,7 @@ trait Types extends api.Types { self: SymbolTable =>
     override def isHigherKinded          = true
     override protected def typeVarString = params.map(_.name).mkString("[", ", ", "]=>" + originName)
   }
-
+  
   /** Precondition: zipped params/args nonEmpty.  (Size equivalence enforced structurally.)
    */
   class AppliedTypeVar(
@@ -2620,17 +2620,17 @@ trait Types extends api.Types { self: SymbolTable =>
     _constr: TypeConstraint,
     zippedArgs: List[(Symbol, Type)]
   ) extends TypeVar(_origin, _constr) {
-
+    
     require(zippedArgs.nonEmpty, this)
 
     override def params: List[Symbol] = zippedArgs map (_._1)
     override def typeArgs: List[Type] = zippedArgs map (_._2)
-
+    
     override protected def typeVarString = (
       zippedArgs map { case (p, a) => p.name + "=" + a } mkString (origin + "[", ", ", "]")
     )
   }
-
+  
   /** A class representing a type variable: not used after phase `typer`.
    *
    *  A higher-kinded TypeVar has params (Symbols) and typeArgs (Types).
@@ -2648,7 +2648,7 @@ trait Types extends api.Types { self: SymbolTable =>
     override def typeArgs: List[Type] = Nil
     override def isHigherKinded = false
 
-    /** The constraint associated with the variable
+    /** The constraint associated with the variable 
      *  Syncnote: Type variables are assumed to be used from only one
      *  thread. They are not exposed in api.Types and are used only locally
      *  in operations that are exposed from types. Hence, no syncing of `constr`
@@ -2659,7 +2659,7 @@ trait Types extends api.Types { self: SymbolTable =>
 
     /** The variable's skolemization level */
     val level = skolemizationLevel
-
+    
     /** Two occurrences of a higher-kinded typevar, e.g. `?CC[Int]` and `?CC[String]`, correspond to
      *  ''two instances'' of `TypeVar` that share the ''same'' `TypeConstraint`.
      *
@@ -2690,7 +2690,7 @@ trait Types extends api.Types { self: SymbolTable =>
     // inference may generate several TypeVar's for a single type parameter that must be inferred,
     // only one of them is in the set of tvars that need to be solved, but
     // they share the same TypeConstraint instance
-
+    
     // When comparing to types containing skolems, remember the highest level
     // of skolemization. If that highest level is higher than our initial
     // skolemizationLevel, we can't re-use those skolems as the solution of this
@@ -2914,7 +2914,7 @@ trait Types extends api.Types { self: SymbolTable =>
     def originLocation = {
       val sym  = origin.typeSymbolDirect
       val encl = sym.owner.logicallyEnclosingMember
-
+      
       // This should display somewhere between one and three
       // things which enclose the origin: at most, a class, a
       // a method, and a term.  At least, a class.
@@ -3258,8 +3258,8 @@ trait Types extends api.Types { self: SymbolTable =>
    */
   object GenPolyType {
     def apply(tparams: List[Symbol], tpe: Type): Type =
-      if (tparams nonEmpty) typeFun(tparams, tpe)
-      else tpe // it's okay to be forgiving here
+    if (tparams nonEmpty) typeFun(tparams, tpe)
+    else tpe // it's okay to be forgiving here
     def unapply(tpe: Type): Option[(List[Symbol], Type)] = tpe match {
       case PolyType(tparams, restpe) => Some(tparams, restpe)
       case _ => Some(List(), tpe)
@@ -3351,7 +3351,7 @@ trait Types extends api.Types { self: SymbolTable =>
         mapOver(tp)
     }
   }
-
+  
   /** Type with all top-level occurrences of abstract types replaced by their bounds */
   def abstractTypesToBounds(tp: Type): Type = tp match { // @M don't normalize here (compiler loops on pos/bug1090.scala )
     case TypeRef(_, sym, _) if sym.isAbstractType =>
@@ -3461,7 +3461,7 @@ trait Types extends api.Types { self: SymbolTable =>
     def this(lo0: List[Type], hi0: List[Type]) = this(lo0, hi0, NoType, NoType)
     def this(bounds: TypeBounds) = this(List(bounds.lo), List(bounds.hi))
     def this() = this(List(), List())
-
+    
     /*  Syncnote: Type constraints are assumed to be used from only one
      *  thread. They are not exposed in api.Types and are used only locally
      *  in operations that are exposed from types. Hence, no syncing of any
@@ -3561,7 +3561,7 @@ trait Types extends api.Types { self: SymbolTable =>
 
     override def variance = _variance
     def variance_=(x: Int) = _variance = x
-
+    
     override protected def noChangeToSymbols(origSyms: List[Symbol]) = {
       origSyms forall { sym =>
         val v = variance
@@ -3727,7 +3727,7 @@ trait Types extends api.Types { self: SymbolTable =>
 
     protected def mapOverArgs(args: List[Type], tparams: List[Symbol]): List[Type] =
       args mapConserve this
-
+    
     /** Called by mapOver to determine whether the original symbols can
      *  be returned, or whether they must be cloned.  Overridden in VariantTypeMap.
      */
@@ -3741,7 +3741,7 @@ trait Types extends api.Types { self: SymbolTable =>
       if (elems1 eq elems) scope
       else newScopeWith(elems1: _*)
     }
-
+    
     /** Map this function over given list of symbols */
     def mapOver(origSyms: List[Symbol]): List[Symbol] = {
       // fast path in case nothing changes due to map
@@ -3804,7 +3804,7 @@ trait Types extends api.Types { self: SymbolTable =>
     def traverse(tp: Type): Unit
     def apply(tp: Type): Type = { traverse(tp); tp }
   }
-
+  
   abstract class TypeTraverserWithResult[T] extends TypeTraverser {
     def result: T
     def clear(): Unit
@@ -3824,13 +3824,13 @@ trait Types extends api.Types { self: SymbolTable =>
    */
   // class ContainsVariantExistentialCollector(v: Int) extends TypeCollector(false) with VariantTypeMap {
   //   variance = v
-  //
+  // 
   //   def traverse(tp: Type) = tp match {
   //     case ExistentialType(_, _) if (variance == v) => result = true
   //     case _ => mapOver(tp)
   //   }
   // }
-  //
+  // 
   // val containsCovariantExistentialCollector = new ContainsVariantExistentialCollector(1)
   // val containsContravariantExistentialCollector = new ContainsVariantExistentialCollector(-1)
 
@@ -3884,7 +3884,7 @@ trait Types extends api.Types { self: SymbolTable =>
         mapOver(tp)
     }
   }
-
+  
   /** Used by existentialAbstraction.
    */
   class ExistentialExtrapolation(tparams: List[Symbol]) extends VariantTypeMap {
@@ -3902,10 +3902,10 @@ trait Types extends api.Types { self: SymbolTable =>
       countOccs(tpe)
       for (tparam <- tparams)
         countOccs(tparam.info)
-
+      
       apply(tpe)
     }
-
+    
     def apply(tp: Type): Type = {
       val tp1 = mapOver(tp)
       if (variance == 0) tp1
@@ -4484,12 +4484,12 @@ trait Types extends api.Types { self: SymbolTable =>
       result
     }
   }
-
+  
   protected def commonOwnerMap: CommonOwnerMap = commonOwnerMapObj
-
+  
   protected class CommonOwnerMap extends TypeTraverserWithResult[Symbol] {
     var result: Symbol = _
-
+    
     def clear() { result = null }
 
     private def register(sym: Symbol) {
@@ -4507,7 +4507,7 @@ trait Types extends api.Types { self: SymbolTable =>
       case _                            => mapOver(tp)
     }
   }
-
+  
   private lazy val commonOwnerMapObj = new CommonOwnerMap
 
   class MissingAliasControl extends ControlThrowable
@@ -4515,7 +4515,7 @@ trait Types extends api.Types { self: SymbolTable =>
   class MissingTypeControl extends ControlThrowable
 
   object adaptToNewRunMap extends TypeMap {
-
+        
     private def adaptToNewRun(pre: Type, sym: Symbol): Symbol = {
       if (phase.flatClasses) {
         sym
@@ -4682,7 +4682,7 @@ trait Types extends api.Types { self: SymbolTable =>
       case (TypeRef(pre1, sym1, args1), TypeRef(pre2, sym2, args2)) =>
         assert(sym1 == sym2)
         pre1 =:= pre2 &&
-        forall3(args1, args2, sym1.typeParams) { (arg1, arg2, tparam) =>
+        forall3(args1, args2, sym1.typeParams) { (arg1, arg2, tparam) => 
             //if (tparam.variance == 0 && !(arg1 =:= arg2)) Console.println("inconsistent: "+arg1+"!="+arg2)//DEBUG
           if (tparam.variance == 0) arg1 =:= arg2
           else if (arg1.isInstanceOf[TypeVar])
@@ -5692,8 +5692,8 @@ trait Types extends api.Types { self: SymbolTable =>
     val formatted = tableDef.table(transposed)
     println("** Depth is " + depth + "\n" + formatted)
   }
-
-  /** From a list of types, find any which take type parameters
+  
+  /** From a list of types, find any which take type parameters 
    *  where the type parameter bounds contain references to other
    *  any types in the list (including itself.)
    *
@@ -6212,13 +6212,13 @@ trait Types extends api.Types { self: SymbolTable =>
 
     if (ts exists (_.isNotNull)) res.notNull else res
   }
-
+  
   /** A list of the typevars in a type. */
   def typeVarsInType(tp: Type): List[TypeVar] = {
     var tvs: List[TypeVar] = Nil
     tp foreach {
       case t: TypeVar => tvs ::= t
-      case _          =>
+      case _          => 
     }
     tvs.reverse
   }
@@ -6230,7 +6230,7 @@ trait Types extends api.Types { self: SymbolTable =>
     // !!! Is it somehow guaranteed that this will not break under nesting?
     // In general one has to save and restore the contents of the field...
     tvs foreach (_.suspended = true)
-    tvs
+    tvs 
   }
 
   /** Compute lub (if `variance == 1`) or glb (if `variance == -1`) of given list
@@ -6460,5 +6460,5 @@ trait Types extends api.Types { self: SymbolTable =>
       } finally {
         tostringRecursions -= 1
       }
-
+   
 }
diff --git a/src/compiler/scala/reflect/runtime/JavaToScala.scala b/src/compiler/scala/reflect/runtime/JavaToScala.scala
index 3b805804a0..813c66e1f0 100644
--- a/src/compiler/scala/reflect/runtime/JavaToScala.scala
+++ b/src/compiler/scala/reflect/runtime/JavaToScala.scala
@@ -354,7 +354,7 @@ trait JavaToScala extends ConversionUtil { self: SymbolTable =>
   def classToScala(jclazz: jClass[_]): Symbol = classCache.toScala(jclazz) {
     val jname = javaTypeName(jclazz)
     def lookup = sOwner(jclazz).info.decl(newTypeName(jclazz.getSimpleName))
-
+    
     if (jclazz.isMemberClass && !nme.isImplClassName(jname)) {
       val sym = lookup
       assert(sym.isType, sym+"/"+jclazz+"/"+sOwner(jclazz)+"/"+jclazz.getSimpleName)
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala
index 8026e92a21..c63070b18f 100644
--- a/src/compiler/scala/tools/nsc/Global.scala
+++ b/src/compiler/scala/tools/nsc/Global.scala
@@ -152,7 +152,7 @@ class Global(var currentSettings: Settings, var reporter: Reporter) extends Symb
   /** Register top level class (called on entering the class)
    */
   def registerTopLevelSym(sym: Symbol) {}
-
+  
 // ------------------ Reporting -------------------------------------
 
   // not deprecated yet, but a method called "error" imported into
@@ -709,18 +709,18 @@ class Global(var currentSettings: Settings, var reporter: Reporter) extends Symb
   private lazy val unitTimings = mutable.HashMap[CompilationUnit, Long]() withDefaultValue 0L // tracking time spent per unit
   private def unitTimingsFormatted(): String = {
     def toMillis(nanos: Long) = "%.3f" format nanos / 1000000d
-
+    
     val formatter = new util.TableDef[(String, String)] {
       >> ("ms"   -> (_._1)) >+ "  "
       << ("path" -> (_._2))
     }
     "" + (
-      new formatter.Table(unitTimings.toList sortBy (-_._2) map {
+      new formatter.Table(unitTimings.toList sortBy (-_._2) map { 
         case (unit, nanos) => (toMillis(nanos), unit.source.path)
       })
     )
   }
-
+  
   protected def addToPhasesSet(sub: SubComponent, descr: String) {
     phasesSet += sub
     phasesDescMap(sub) = descr
@@ -867,7 +867,7 @@ class Global(var currentSettings: Settings, var reporter: Reporter) extends Symb
     /** Counts for certain classes of warnings during this run. */
     var deprecationWarnings: List[(Position, String)] = Nil
     var uncheckedWarnings: List[(Position, String)] = Nil
-
+    
     /** A flag whether macro expansions failed */
     var macroExpansionFailed = false
 
@@ -1014,7 +1014,7 @@ class Global(var currentSettings: Settings, var reporter: Reporter) extends Symb
     }
 
     def cancel() { reporter.cancelled = true }
-
+    
     private def currentProgress   = (phasec * size) + unitc
     private def totalProgress     = (phaseDescriptors.size - 1) * size // -1: drops terminal phase
     private def refreshProgress() = if (size > 0) progress(currentProgress, totalProgress)
@@ -1181,12 +1181,12 @@ class Global(var currentSettings: Settings, var reporter: Reporter) extends Symb
      */
     def compileUnits(units: List[CompilationUnit], fromPhase: Phase) {
       try compileUnitsInternal(units, fromPhase)
-      catch { case ex =>
+      catch { case ex => 
         globalError(supplementErrorMessage("uncaught exception during compilation: " + ex.getClass.getName))
         throw ex
       }
     }
-
+    
     private def compileUnitsInternal(units: List[CompilationUnit], fromPhase: Phase) {
       units foreach addUnit
       if (opt.profileAll) {
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
index c3e156104f..eb7c5a6699 100644
--- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
@@ -292,8 +292,8 @@ self =>
     }
     private lazy val primitiveNames: Set[Name] = tpnme.ScalaValueNames.toSet
 
-    private def inScalaRootPackage          = inScalaPackage && currentPackage == "scala"
-    private def isScalaArray(name: Name)    = inScalaRootPackage && name == tpnme.Array
+    private def inScalaRootPackage       = inScalaPackage && currentPackage == "scala"
+    private def isScalaArray(name: Name) = inScalaRootPackage && name == tpnme.Array
     private def isPrimitiveType(name: Name) = inScalaRootPackage && primitiveNames(name)
 
     def parseStartRule: () => Tree
diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
index 7aa3e77471..a0826c19c3 100644
--- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
+++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
@@ -368,7 +368,7 @@ abstract class ClassfileParser {
         case arr: Type     => Constant(arr)
       }
     }
-
+    
     private def getSubArray(bytes: Array[Byte]): Array[Byte] = {
       val decodedLength = ByteCodecs.decode(bytes)
       val arr           = new Array[Byte](decodedLength)
@@ -719,7 +719,7 @@ abstract class ClassfileParser {
                       index += 1
                       val bounds = variance match {
                         case '+' => TypeBounds.upper(objToAny(sig2type(tparams, skiptvs)))
-                        case '-' =>
+                        case '-' => 
                           val tp = sig2type(tparams, skiptvs)
                           // sig2type seems to return AnyClass regardless of the situation:
                           // we don't want Any as a LOWER bound.
diff --git a/src/compiler/scala/tools/nsc/transform/Erasure.scala b/src/compiler/scala/tools/nsc/transform/Erasure.scala
index 6b7e34cf49..30bfdbaf5b 100644
--- a/src/compiler/scala/tools/nsc/transform/Erasure.scala
+++ b/src/compiler/scala/tools/nsc/transform/Erasure.scala
@@ -956,8 +956,8 @@ abstract class Erasure extends AddInterfaces
           } else if (fn.symbol.owner.isInlineClass && extensionMethods.hasExtension(fn.symbol)) {
             Apply(gen.mkAttributedRef(extensionMethods.extensionMethod(fn.symbol)), qualifier :: args)
           } else {
-            tree
-          }
+                tree
+            }
 
         case Select(qual, name) =>
           val owner = tree.symbol.owner
diff --git a/src/compiler/scala/tools/nsc/transform/LambdaLift.scala b/src/compiler/scala/tools/nsc/transform/LambdaLift.scala
index 35edf19a41..712298bd89 100644
--- a/src/compiler/scala/tools/nsc/transform/LambdaLift.scala
+++ b/src/compiler/scala/tools/nsc/transform/LambdaLift.scala
@@ -18,7 +18,7 @@ abstract class LambdaLift extends InfoTransform {
 
   /** the following two members override abstract members in Transform */
   val phaseName: String = "lambdalift"
-
+    
   /** Converts types of captured variables to *Ref types.
    */
   def boxIfCaptured(sym: Symbol, tpe: Type, erasedTypes: Boolean) =
@@ -72,10 +72,10 @@ abstract class LambdaLift extends InfoTransform {
 
     /** Buffers for lifted out classes and methods */
     private val liftedDefs = new LinkedHashMap[Symbol, List[Tree]]
-
+    
     /** True if we are transforming under a ReferenceToBoxed node */
     private var isBoxedRef = false
-
+    
     private type SymSet = TreeSet[Symbol]
 
     private def newSymSet = new TreeSet[Symbol](_ isLess _)
@@ -213,7 +213,7 @@ abstract class LambdaLift extends InfoTransform {
         for (caller <- called.keys ; callee <- called(caller) ; fvs <- free get callee ; fv <- fvs)
           markFree(fv, caller)
       } while (changedFreeVars)
-
+      
       def renameSym(sym: Symbol) {
         val originalName = sym.name
         val base = sym.name + nme.NAME_JOIN_STRING + (
@@ -404,10 +404,10 @@ abstract class LambdaLift extends InfoTransform {
             def refConstr(expr: Tree): Tree = expr match {
               case Try(block, catches, finalizer) =>
                 Try(refConstr(block), catches map refConstrCase, finalizer)
-              case _ =>
+              case _ => 
                 Apply(Select(New(TypeTree(sym.tpe)), nme.CONSTRUCTOR), List(expr))
             }
-            def refConstrCase(cdef: CaseDef): CaseDef =
+            def refConstrCase(cdef: CaseDef): CaseDef = 
               CaseDef(cdef.pat, cdef.guard, refConstr(cdef.body))
             treeCopy.ValDef(tree, mods, name, tpt1, typer.typedPos(rhs.pos) {
               refConstr(constructorArg)
@@ -452,7 +452,7 @@ abstract class LambdaLift extends InfoTransform {
           tree
       }
     }
-
+    
     private def preTransform(tree: Tree) = super.transform(tree) setType lifted(tree.tpe)
 
     override def transform(tree: Tree): Tree = tree match {
@@ -461,7 +461,7 @@ abstract class LambdaLift extends InfoTransform {
       case _ =>
         postTransform(preTransform(tree))
     }
-
+      
     /** Transform statements and add lifted definitions to them. */
     override def transformStats(stats: List[Tree], exprOwner: Symbol): List[Tree] = {
       def addLifted(stat: Tree): Tree = stat match {
diff --git a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
index 422b1b7b7d..7d49c98dfb 100644
--- a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
+++ b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
@@ -74,7 +74,7 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers {
     AnyRefClass, ObjectClass, Predef_AnyRef,
     uncheckedVarianceClass
   }
-
+  
   /** TODO - this is a lot of maps.
    */
 
@@ -494,7 +494,7 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers {
 
       def cloneInSpecializedClass(member: Symbol, flagFn: Long => Long) =
         member.cloneSymbol(sClass, flagFn(member.flags | SPECIALIZED))
-
+      
       sClass.sourceFile = clazz.sourceFile
       currentRun.symSource(sClass) = clazz.sourceFile // needed later on by mixin
 
@@ -1197,7 +1197,7 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers {
     } else NoSymbol
 
   def illegalSpecializedInheritance(clazz: Symbol): Boolean = (
-       hasSpecializedFlag(clazz)
+       hasSpecializedFlag(clazz) 
     && originalClass(clazz).parentSymbols.exists(p => hasSpecializedParams(p) && !p.isTrait)
   )
 
@@ -1261,7 +1261,7 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers {
           val specMember = specCandidates suchThat { s =>
             doesConform(symbol, tree.tpe, qual.tpe.memberType(s), env)
           }
-
+          
           log("[specSym] found: " + specCandidates.tpe + ", instantiated as: " + tree.tpe)
           log("[specSym] found specMember: " + specMember)
           if (specMember ne NoSymbol)
@@ -1378,7 +1378,7 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers {
             (new CollectMethodBodies)(tree)
           val parents1 = map2(currentOwner.info.parents, parents)((tpe, parent) =>
             TypeTree(tpe) setPos parent.pos)
-
+          
           treeCopy.Template(tree,
             parents1    /*currentOwner.info.parents.map(tpe => TypeTree(tpe) setPos parents.head.pos)*/ ,
             self,
diff --git a/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala b/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
index 685dce213c..68bc80ffc4 100644
--- a/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
@@ -31,14 +31,14 @@ trait ContextErrors {
 
   case class NormalTypeError(underlyingTree: Tree, errMsg: String, kind: ErrorKind = ErrorKinds.Normal)
     extends AbsTypeError {
-
+    
     def errPos:Position = underlyingTree.pos
     override def toString() = "[Type error at:" + underlyingTree.pos + "] " + errMsg
   }
 
   case class SymbolTypeError(underlyingSym: Symbol, errMsg: String, kind: ErrorKind = ErrorKinds.Normal)
     extends AbsTypeError {
-
+    
     def errPos = underlyingSym.pos
   }
 
@@ -76,7 +76,7 @@ trait ContextErrors {
     }
 
     def issueTypeError(err: AbsTypeError)(implicit context: Context) { context.issue(err) }
-
+   
     def typeErrorMsg(found: Type, req: Type, possiblyMissingArgs: Boolean) = {
       def missingArgsMsg = if (possiblyMissingArgs) "\n possible cause: missing arguments for method or constructor" else ""
       "type mismatch" + foundReqMsg(found, req) + missingArgsMsg
@@ -177,13 +177,13 @@ trait ContextErrors {
         val calcSimilar = (
           name.length > 2 && (
                startingIdentCx.reportErrors
-            || startingIdentCx.enclClassOrMethod.reportErrors
+            || startingIdentCx.enclClassOrMethod.reportErrors	
           )
         )
-        // avoid calculating if we're in "silent" mode.
-        // name length check to limit unhelpful suggestions for e.g. "x" and "b1"
+        // avoid calculating if we're in "silent" mode.	
+        // name length check to limit unhelpful suggestions for e.g. "x" and "b1"	
         val similar = {
-          if (!calcSimilar) ""
+          if (!calcSimilar) ""	
           else {
             val allowed = (
               startingIdentCx.enclosingContextChain
@@ -636,8 +636,8 @@ trait ContextErrors {
 
      def CyclicReferenceError(errPos: Position, lockedSym: Symbol) =
        issueTypeError(PosAndMsgTypeError(errPos, "illegal cyclic reference involving " + lockedSym))
-
-     def MacroExpandError(tree: Tree, t: Any) = {
+       
+     def MacroExpandError(tree: Tree, t: Any) = { 
        issueNormalTypeError(tree, "macros must return a compiler-specific tree; returned class is: " + t.getClass)
        setError(tree)
      }
@@ -667,7 +667,7 @@ trait ContextErrors {
         type ErrorType = Value
         val WrongNumber, NoParams, ArgsDoNotConform = Value
       }
-
+      
       private def ambiguousErrorMsgPos(pos: Position, pre: Type, sym1: Symbol, sym2: Symbol, rest: String) =
         if (sym1.hasDefaultFlag && sym2.hasDefaultFlag && sym1.enclClass == sym2.enclClass) {
           val methodName = nme.defaultGetterToMethod(sym1.name)
@@ -830,14 +830,14 @@ trait ContextErrors {
     object NamerErrorGen {
 
       implicit val context0 = context
-
+      
       object SymValidateErrors extends Enumeration {
         val ImplicitConstr, ImplicitNotTerm, ImplicitTopObject,
           OverrideClass, SealedNonClass, AbstractNonClass,
           OverrideConstr, AbstractOverride, LazyAndEarlyInit,
           ByNameParameter, AbstractVar = Value
       }
-
+      
       object DuplicatesErrorKinds extends Enumeration {
         val RenamedTwice, AppearsTwice = Value
       }
@@ -845,7 +845,7 @@ trait ContextErrors {
       import SymValidateErrors._
       import DuplicatesErrorKinds._
       import symtab.Flags
-
+      
       def TypeSigError(tree: Tree, ex: TypeError) = {
         ex match {
           case CyclicReference(sym, info: TypeCompleter) =>
@@ -854,7 +854,7 @@ trait ContextErrors {
             context0.issue(TypeErrorWithUnderlyingTree(tree, ex))
         }
       }
-
+      
       def GetterDefinedTwiceError(getter: Symbol) =
         issueSymbolTypeError(getter, getter+" is defined twice")
 
@@ -897,37 +897,37 @@ trait ContextErrors {
         val msg = errKind match {
           case ImplicitConstr =>
             "`implicit' modifier not allowed for constructors"
-
+            
           case ImplicitNotTerm =>
             "`implicit' modifier can be used only for values, variables and methods"
-
+            
           case ImplicitTopObject =>
             "`implicit' modifier cannot be used for top-level objects"
-
+            
           case OverrideClass =>
             "`override' modifier not allowed for classes"
-
+            
           case SealedNonClass =>
             "`sealed' modifier can be used only for classes"
-
+            
           case AbstractNonClass =>
             "`abstract' modifier can be used only for classes; it should be omitted for abstract members"
-
+            
           case OverrideConstr =>
             "`override' modifier not allowed for constructors"
-
+            
           case AbstractOverride =>
             "`abstract override' modifier only allowed for members of traits"
-
+            
           case LazyAndEarlyInit =>
             "`lazy' definitions may not be initialized early"
-
+            
           case ByNameParameter =>
             "pass-by-name arguments not allowed for case class parameters"
-
+            
           case AbstractVar =>
             "only classes can have declared but undefined members" + abstractVarMessage(sym)
-
+            
         }
         issueSymbolTypeError(sym, msg)
       }
diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
index 1c40675508..b9f3adec75 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
@@ -113,7 +113,7 @@ trait Namers extends MethodSynthesis {
     private def contextFile = context.unit.source.file
     private def typeErrorHandler[T](tree: Tree, alt: T): PartialFunction[Throwable, T] = {
       case ex: TypeError =>
-        // H@ need to ensure that we handle only cyclic references
+        // H@ need to ensure that we handle only cyclic references 
         TypeSigError(tree, ex)
         alt
     }
@@ -296,7 +296,7 @@ trait Namers extends MethodSynthesis {
       val pos         = tree.pos
       val isParameter = tree.mods.isParameter
       val flags       = tree.mods.flags & mask
-
+      
       tree match {
         case TypeDef(_, _, _, _) if isParameter     => owner.newTypeParameter(name.toTypeName, pos, flags)
         case TypeDef(_, _, _, _)                    => owner.newTypeSymbol(name.toTypeName, pos, flags)
diff --git a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
index d492ba3662..4449116fd1 100644
--- a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
@@ -686,13 +686,13 @@ abstract class RefChecks extends InfoTransform with reflect.internal.transform.R
       } else if (clazz.isTrait) {
         // prevent abstract methods in interfaces that override final members in Object; see #4431
         if (!(clazz isSubClass AnyValClass)) {
-          for (decl <- clazz.info.decls.iterator) {
-            val overridden = decl.overriddenSymbol(ObjectClass)
-            if (overridden.isFinal)
-              unit.error(decl.pos, "trait cannot redefine final method from class AnyRef")
-          }
+        for (decl <- clazz.info.decls.iterator) {
+          val overridden = decl.overriddenSymbol(ObjectClass)
+          if (overridden.isFinal)
+            unit.error(decl.pos, "trait cannot redefine final method from class AnyRef")
         }
       }
+      }
 
       /** Returns whether there is a symbol declared in class `inclazz`
        *  (which must be different from `clazz`) whose name and type
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index 7c16c7642d..b6f555e42a 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -154,7 +154,7 @@ trait Typers extends Modes with Adaptations with PatMatVirtualiser {
       case ErrorType =>
         fun
     }
-
+    
     def inferView(tree: Tree, from: Type, to: Type, reportAmbiguous: Boolean): Tree =
       inferView(tree, from, to, reportAmbiguous, true)
 
@@ -274,7 +274,7 @@ trait Typers extends Modes with Adaptations with PatMatVirtualiser {
       }
       tp match {
         case TypeRef(pre, sym, args) =>
-          checkNotLocked(sym) &&
+          checkNotLocked(sym) && 
           ((!sym.isNonClassType) || checkNonCyclic(pos, appliedType(pre.memberInfo(sym), args), sym))
           // @M! info for a type ref to a type parameter now returns a polytype
           // @M was: checkNonCyclic(pos, pre.memberInfo(sym).subst(sym.typeParams, args), sym)
@@ -939,7 +939,7 @@ trait Typers extends Modes with Adaptations with PatMatVirtualiser {
             adaptType()
           else if (inExprModeButNot(mode, FUNmode) && tree.symbol != null && tree.symbol.isMacro && !tree.isDef) {
             val tree1 = expandMacro(tree)
-            if (tree1.isErroneous) tree1 else typed(tree1, mode, pt)
+            if (tree1.isErroneous) tree1 else typed(tree1, mode, pt) 
           } else if ((mode & (PATTERNmode | FUNmode)) == (PATTERNmode | FUNmode))
             adaptConstrPattern()
           else if (inAllModes(mode, EXPRmode | FUNmode) &&
@@ -1084,7 +1084,7 @@ trait Typers extends Modes with Adaptations with PatMatVirtualiser {
         // Note: implicit arguments are still inferred (this kind of "chaining" is allowed)
       )
     }
-
+    
     def adaptToMember(qual: Tree, searchTemplate: Type): Tree =
       adaptToMember(qual, searchTemplate, true, true)
     def adaptToMember(qual: Tree, searchTemplate: Type, reportAmbiguous: Boolean): Tree =
@@ -1099,12 +1099,12 @@ trait Typers extends Modes with Adaptations with PatMatVirtualiser {
         }
         inferView(qual, qual.tpe, searchTemplate, reportAmbiguous, saveErrors) match {
           case EmptyTree  => qual
-          case coercion   =>
+          case coercion   => 
             if (settings.logImplicitConv.value)
               unit.echo(qual.pos,
                 "applied implicit conversion from %s to %s = %s".format(
                   qual.tpe, searchTemplate, coercion.symbol.defString))
-
+            
             typedQualifier(atPos(qual.pos)(new ApplyImplicitView(coercion, List(qual))))
         }
       }
@@ -2889,10 +2889,10 @@ trait Typers extends Modes with Adaptations with PatMatVirtualiser {
     def packSymbols(hidden: List[Symbol], tp: Type): Type =
       if (hidden.isEmpty) tp
       else existentialTransform(hidden, tp)(existentialAbstraction)
-
+      
     def isReferencedFrom(ctx: Context, sym: Symbol): Boolean =
-      ctx.owner.isTerm &&
-      (ctx.scope.exists { dcl => dcl.isInitialized && (dcl.info contains sym) }) ||
+      ctx.owner.isTerm && 
+      (ctx.scope.exists { dcl => dcl.isInitialized && (dcl.info contains sym) }) || 
       {
         var ctx1 = ctx.outer
         while ((ctx1 != NoContext) && (ctx1.scope eq ctx.scope)) ctx1 = ctx1.outer
@@ -3879,7 +3879,7 @@ trait Typers extends Modes with Adaptations with PatMatVirtualiser {
           reallyExists(sym) &&
           ((mode & PATTERNmode | FUNmode) != (PATTERNmode | FUNmode) || !sym.isSourceMethod || sym.hasFlag(ACCESSOR))
         }
-
+        
         if (defSym == NoSymbol) {
           var defEntry: ScopeEntry = null // the scope entry of defSym, if defined in a local scope
 
@@ -4370,7 +4370,7 @@ trait Typers extends Modes with Adaptations with PatMatVirtualiser {
 
         case ReferenceToBoxed(idt @ Ident(_)) =>
           val id1 = typed1(idt, mode, pt) match { case id: Ident => id }
-          treeCopy.ReferenceToBoxed(tree, id1) setType AnyRefClass.tpe
+          treeCopy.ReferenceToBoxed(tree, id1) setType AnyRefClass.tpe         
 
         case Literal(value) =>
           tree setType (
diff --git a/src/library/scala/Byte.scala b/src/library/scala/Byte.scala
index beff5ce208..f9c5f6003e 100644
--- a/src/library/scala/Byte.scala
+++ b/src/library/scala/Byte.scala
@@ -30,7 +30,7 @@ final class Byte extends AnyVal {
  * @return the bitwise negation of this value
  * @example {{{
  * ~5 == -6
- * // in binary: ~00000101 == 
+ * // in binary: ~00000101 ==
  * //             11111010
  * }}}
  */
@@ -60,22 +60,22 @@ final class Byte extends AnyVal {
   def <<(x: Long): Int = sys.error("stub")
   /**
   * @return this value bit-shifted right by the specified number of bits,
-  *         filling the new left bits with zeroes. 
+  *         filling the new left bits with zeroes.
   * @example {{{ 21 >>> 3 == 2 // in binary: 010101 >>> 3 == 010 }}}
   * @example {{{
-  * -21 >>> 3 == 536870909 
-  * // in binary: 11111111 11111111 11111111 11101011 >>> 3 == 
+  * -21 >>> 3 == 536870909
+  * // in binary: 11111111 11111111 11111111 11101011 >>> 3 ==
   * //            00011111 11111111 11111111 11111101
   * }}}
   */
   def >>>(x: Int): Int = sys.error("stub")
   /**
   * @return this value bit-shifted right by the specified number of bits,
-  *         filling the new left bits with zeroes. 
+  *         filling the new left bits with zeroes.
   * @example {{{ 21 >>> 3 == 2 // in binary: 010101 >>> 3 == 010 }}}
   * @example {{{
-  * -21 >>> 3 == 536870909 
-  * // in binary: 11111111 11111111 11111111 11101011 >>> 3 == 
+  * -21 >>> 3 == 536870909
+  * // in binary: 11111111 11111111 11111111 11101011 >>> 3 ==
   * //            00011111 11111111 11111111 11111101
   * }}}
   */
@@ -85,8 +85,8 @@ final class Byte extends AnyVal {
   *         filling in the right bits with the same value as the left-most bit of this.
   *         The effect of this is to retain the sign of the value.
   * @example {{{
-  * -21 >> 3 == -3 
-  * // in binary: 11111111 11111111 11111111 11101011 >> 3 == 
+  * -21 >> 3 == -3
+  * // in binary: 11111111 11111111 11111111 11101011 >> 3 ==
   * //            11111111 11111111 11111111 11111101
   * }}}
   */
@@ -96,8 +96,8 @@ final class Byte extends AnyVal {
   *         filling in the right bits with the same value as the left-most bit of this.
   *         The effect of this is to retain the sign of the value.
   * @example {{{
-  * -21 >> 3 == -3 
-  * // in binary: 11111111 11111111 11111111 11101011 >> 3 == 
+  * -21 >> 3 == -3
+  * // in binary: 11111111 11111111 11111111 11101011 >> 3 ==
   * //            11111111 11111111 11111111 11111101
   * }}}
   */
@@ -281,9 +281,9 @@ final class Byte extends AnyVal {
   * @return the bitwise OR of this value and x
   * @example {{{
   * (0xf0 | 0xaa) == 0xfa
-  * // in binary:   11110000 
-  * //            | 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            | 10101010
+  * //              --------
   * //              11111010
   * }}}
   */
@@ -292,9 +292,9 @@ final class Byte extends AnyVal {
   * @return the bitwise OR of this value and x
   * @example {{{
   * (0xf0 | 0xaa) == 0xfa
-  * // in binary:   11110000 
-  * //            | 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            | 10101010
+  * //              --------
   * //              11111010
   * }}}
   */
@@ -303,9 +303,9 @@ final class Byte extends AnyVal {
   * @return the bitwise OR of this value and x
   * @example {{{
   * (0xf0 | 0xaa) == 0xfa
-  * // in binary:   11110000 
-  * //            | 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            | 10101010
+  * //              --------
   * //              11111010
   * }}}
   */
@@ -314,9 +314,9 @@ final class Byte extends AnyVal {
   * @return the bitwise OR of this value and x
   * @example {{{
   * (0xf0 | 0xaa) == 0xfa
-  * // in binary:   11110000 
-  * //            | 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            | 10101010
+  * //              --------
   * //              11111010
   * }}}
   */
@@ -325,9 +325,9 @@ final class Byte extends AnyVal {
   * @return the bitwise OR of this value and x
   * @example {{{
   * (0xf0 | 0xaa) == 0xfa
-  * // in binary:   11110000 
-  * //            | 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            | 10101010
+  * //              --------
   * //              11111010
   * }}}
   */
@@ -337,9 +337,9 @@ final class Byte extends AnyVal {
   * @return the bitwise AND of this value and x
   * @example {{{
   * (0xf0 & 0xaa) == 0xa0
-  * // in binary:   11110000 
-  * //            & 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            & 10101010
+  * //              --------
   * //              10100000
   * }}}
   */
@@ -348,9 +348,9 @@ final class Byte extends AnyVal {
   * @return the bitwise AND of this value and x
   * @example {{{
   * (0xf0 & 0xaa) == 0xa0
-  * // in binary:   11110000 
-  * //            & 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            & 10101010
+  * //              --------
   * //              10100000
   * }}}
   */
@@ -359,9 +359,9 @@ final class Byte extends AnyVal {
   * @return the bitwise AND of this value and x
   * @example {{{
   * (0xf0 & 0xaa) == 0xa0
-  * // in binary:   11110000 
-  * //            & 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            & 10101010
+  * //              --------
   * //              10100000
   * }}}
   */
@@ -370,9 +370,9 @@ final class Byte extends AnyVal {
   * @return the bitwise AND of this value and x
   * @example {{{
   * (0xf0 & 0xaa) == 0xa0
-  * // in binary:   11110000 
-  * //            & 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            & 10101010
+  * //              --------
   * //              10100000
   * }}}
   */
@@ -381,9 +381,9 @@ final class Byte extends AnyVal {
   * @return the bitwise AND of this value and x
   * @example {{{
   * (0xf0 & 0xaa) == 0xa0
-  * // in binary:   11110000 
-  * //            & 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            & 10101010
+  * //              --------
   * //              10100000
   * }}}
   */
@@ -393,9 +393,9 @@ final class Byte extends AnyVal {
   * @return the bitwise XOR of this value and x
   * @example {{{
   * (0xf0 ^ 0xaa) == 0x5a
-  * // in binary:   11110000 
-  * //            ^ 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            ^ 10101010
+  * //              --------
   * //              01011010
   * }}}
   */
@@ -404,9 +404,9 @@ final class Byte extends AnyVal {
   * @return the bitwise XOR of this value and x
   * @example {{{
   * (0xf0 ^ 0xaa) == 0x5a
-  * // in binary:   11110000 
-  * //            ^ 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            ^ 10101010
+  * //              --------
   * //              01011010
   * }}}
   */
@@ -415,9 +415,9 @@ final class Byte extends AnyVal {
   * @return the bitwise XOR of this value and x
   * @example {{{
   * (0xf0 ^ 0xaa) == 0x5a
-  * // in binary:   11110000 
-  * //            ^ 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            ^ 10101010
+  * //              --------
   * //              01011010
   * }}}
   */
@@ -426,9 +426,9 @@ final class Byte extends AnyVal {
   * @return the bitwise XOR of this value and x
   * @example {{{
   * (0xf0 ^ 0xaa) == 0x5a
-  * // in binary:   11110000 
-  * //            ^ 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            ^ 10101010
+  * //              --------
   * //              01011010
   * }}}
   */
@@ -437,9 +437,9 @@ final class Byte extends AnyVal {
   * @return the bitwise XOR of this value and x
   * @example {{{
   * (0xf0 ^ 0xaa) == 0x5a
-  * // in binary:   11110000 
-  * //            ^ 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            ^ 10101010
+  * //              --------
   * //              01011010
   * }}}
   */
diff --git a/src/library/scala/Char.scala b/src/library/scala/Char.scala
index dade572396..3d459782cd 100644
--- a/src/library/scala/Char.scala
+++ b/src/library/scala/Char.scala
@@ -30,7 +30,7 @@ final class Char extends AnyVal {
  * @return the bitwise negation of this value
  * @example {{{
  * ~5 == -6
- * // in binary: ~00000101 == 
+ * // in binary: ~00000101 ==
  * //             11111010
  * }}}
  */
@@ -60,22 +60,22 @@ final class Char extends AnyVal {
   def <<(x: Long): Int = sys.error("stub")
   /**
   * @return this value bit-shifted right by the specified number of bits,
-  *         filling the new left bits with zeroes. 
+  *         filling the new left bits with zeroes.
   * @example {{{ 21 >>> 3 == 2 // in binary: 010101 >>> 3 == 010 }}}
   * @example {{{
-  * -21 >>> 3 == 536870909 
-  * // in binary: 11111111 11111111 11111111 11101011 >>> 3 == 
+  * -21 >>> 3 == 536870909
+  * // in binary: 11111111 11111111 11111111 11101011 >>> 3 ==
   * //            00011111 11111111 11111111 11111101
   * }}}
   */
   def >>>(x: Int): Int = sys.error("stub")
   /**
   * @return this value bit-shifted right by the specified number of bits,
-  *         filling the new left bits with zeroes. 
+  *         filling the new left bits with zeroes.
   * @example {{{ 21 >>> 3 == 2 // in binary: 010101 >>> 3 == 010 }}}
   * @example {{{
-  * -21 >>> 3 == 536870909 
-  * // in binary: 11111111 11111111 11111111 11101011 >>> 3 == 
+  * -21 >>> 3 == 536870909
+  * // in binary: 11111111 11111111 11111111 11101011 >>> 3 ==
   * //            00011111 11111111 11111111 11111101
   * }}}
   */
@@ -85,8 +85,8 @@ final class Char extends AnyVal {
   *         filling in the right bits with the same value as the left-most bit of this.
   *         The effect of this is to retain the sign of the value.
   * @example {{{
-  * -21 >> 3 == -3 
-  * // in binary: 11111111 11111111 11111111 11101011 >> 3 == 
+  * -21 >> 3 == -3
+  * // in binary: 11111111 11111111 11111111 11101011 >> 3 ==
   * //            11111111 11111111 11111111 11111101
   * }}}
   */
@@ -96,8 +96,8 @@ final class Char extends AnyVal {
   *         filling in the right bits with the same value as the left-most bit of this.
   *         The effect of this is to retain the sign of the value.
   * @example {{{
-  * -21 >> 3 == -3 
-  * // in binary: 11111111 11111111 11111111 11101011 >> 3 == 
+  * -21 >> 3 == -3
+  * // in binary: 11111111 11111111 11111111 11101011 >> 3 ==
   * //            11111111 11111111 11111111 11111101
   * }}}
   */
@@ -281,9 +281,9 @@ final class Char extends AnyVal {
   * @return the bitwise OR of this value and x
   * @example {{{
   * (0xf0 | 0xaa) == 0xfa
-  * // in binary:   11110000 
-  * //            | 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            | 10101010
+  * //              --------
   * //              11111010
   * }}}
   */
@@ -292,9 +292,9 @@ final class Char extends AnyVal {
   * @return the bitwise OR of this value and x
   * @example {{{
   * (0xf0 | 0xaa) == 0xfa
-  * // in binary:   11110000 
-  * //            | 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            | 10101010
+  * //              --------
   * //              11111010
   * }}}
   */
@@ -303,9 +303,9 @@ final class Char extends AnyVal {
   * @return the bitwise OR of this value and x
   * @example {{{
   * (0xf0 | 0xaa) == 0xfa
-  * // in binary:   11110000 
-  * //            | 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            | 10101010
+  * //              --------
   * //              11111010
   * }}}
   */
@@ -314,9 +314,9 @@ final class Char extends AnyVal {
   * @return the bitwise OR of this value and x
   * @example {{{
   * (0xf0 | 0xaa) == 0xfa
-  * // in binary:   11110000 
-  * //            | 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            | 10101010
+  * //              --------
   * //              11111010
   * }}}
   */
@@ -325,9 +325,9 @@ final class Char extends AnyVal {
   * @return the bitwise OR of this value and x
   * @example {{{
   * (0xf0 | 0xaa) == 0xfa
-  * // in binary:   11110000 
-  * //            | 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            | 10101010
+  * //              --------
   * //              11111010
   * }}}
   */
@@ -337,9 +337,9 @@ final class Char extends AnyVal {
   * @return the bitwise AND of this value and x
   * @example {{{
   * (0xf0 & 0xaa) == 0xa0
-  * // in binary:   11110000 
-  * //            & 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            & 10101010
+  * //              --------
   * //              10100000
   * }}}
   */
@@ -348,9 +348,9 @@ final class Char extends AnyVal {
   * @return the bitwise AND of this value and x
   * @example {{{
   * (0xf0 & 0xaa) == 0xa0
-  * // in binary:   11110000 
-  * //            & 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            & 10101010
+  * //              --------
   * //              10100000
   * }}}
   */
@@ -359,9 +359,9 @@ final class Char extends AnyVal {
   * @return the bitwise AND of this value and x
   * @example {{{
   * (0xf0 & 0xaa) == 0xa0
-  * // in binary:   11110000 
-  * //            & 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            & 10101010
+  * //              --------
   * //              10100000
   * }}}
   */
@@ -370,9 +370,9 @@ final class Char extends AnyVal {
   * @return the bitwise AND of this value and x
   * @example {{{
   * (0xf0 & 0xaa) == 0xa0
-  * // in binary:   11110000 
-  * //            & 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            & 10101010
+  * //              --------
   * //              10100000
   * }}}
   */
@@ -381,9 +381,9 @@ final class Char extends AnyVal {
   * @return the bitwise AND of this value and x
   * @example {{{
   * (0xf0 & 0xaa) == 0xa0
-  * // in binary:   11110000 
-  * //            & 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            & 10101010
+  * //              --------
   * //              10100000
   * }}}
   */
@@ -393,9 +393,9 @@ final class Char extends AnyVal {
   * @return the bitwise XOR of this value and x
   * @example {{{
   * (0xf0 ^ 0xaa) == 0x5a
-  * // in binary:   11110000 
-  * //            ^ 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            ^ 10101010
+  * //              --------
   * //              01011010
   * }}}
   */
@@ -404,9 +404,9 @@ final class Char extends AnyVal {
   * @return the bitwise XOR of this value and x
   * @example {{{
   * (0xf0 ^ 0xaa) == 0x5a
-  * // in binary:   11110000 
-  * //            ^ 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            ^ 10101010
+  * //              --------
   * //              01011010
   * }}}
   */
@@ -415,9 +415,9 @@ final class Char extends AnyVal {
   * @return the bitwise XOR of this value and x
   * @example {{{
   * (0xf0 ^ 0xaa) == 0x5a
-  * // in binary:   11110000 
-  * //            ^ 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            ^ 10101010
+  * //              --------
   * //              01011010
   * }}}
   */
@@ -426,9 +426,9 @@ final class Char extends AnyVal {
   * @return the bitwise XOR of this value and x
   * @example {{{
   * (0xf0 ^ 0xaa) == 0x5a
-  * // in binary:   11110000 
-  * //            ^ 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            ^ 10101010
+  * //              --------
   * //              01011010
   * }}}
   */
@@ -437,9 +437,9 @@ final class Char extends AnyVal {
   * @return the bitwise XOR of this value and x
   * @example {{{
   * (0xf0 ^ 0xaa) == 0x5a
-  * // in binary:   11110000 
-  * //            ^ 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            ^ 10101010
+  * //              --------
   * //              01011010
   * }}}
   */
diff --git a/src/library/scala/Int.scala b/src/library/scala/Int.scala
index 6b7debf2df..316bbced2d 100644
--- a/src/library/scala/Int.scala
+++ b/src/library/scala/Int.scala
@@ -30,7 +30,7 @@ final class Int extends AnyVal {
  * @return the bitwise negation of this value
  * @example {{{
  * ~5 == -6
- * // in binary: ~00000101 == 
+ * // in binary: ~00000101 ==
  * //             11111010
  * }}}
  */
@@ -60,22 +60,22 @@ final class Int extends AnyVal {
   def <<(x: Long): Int = sys.error("stub")
   /**
   * @return this value bit-shifted right by the specified number of bits,
-  *         filling the new left bits with zeroes. 
+  *         filling the new left bits with zeroes.
   * @example {{{ 21 >>> 3 == 2 // in binary: 010101 >>> 3 == 010 }}}
   * @example {{{
-  * -21 >>> 3 == 536870909 
-  * // in binary: 11111111 11111111 11111111 11101011 >>> 3 == 
+  * -21 >>> 3 == 536870909
+  * // in binary: 11111111 11111111 11111111 11101011 >>> 3 ==
   * //            00011111 11111111 11111111 11111101
   * }}}
   */
   def >>>(x: Int): Int = sys.error("stub")
   /**
   * @return this value bit-shifted right by the specified number of bits,
-  *         filling the new left bits with zeroes. 
+  *         filling the new left bits with zeroes.
   * @example {{{ 21 >>> 3 == 2 // in binary: 010101 >>> 3 == 010 }}}
   * @example {{{
-  * -21 >>> 3 == 536870909 
-  * // in binary: 11111111 11111111 11111111 11101011 >>> 3 == 
+  * -21 >>> 3 == 536870909
+  * // in binary: 11111111 11111111 11111111 11101011 >>> 3 ==
   * //            00011111 11111111 11111111 11111101
   * }}}
   */
@@ -85,8 +85,8 @@ final class Int extends AnyVal {
   *         filling in the right bits with the same value as the left-most bit of this.
   *         The effect of this is to retain the sign of the value.
   * @example {{{
-  * -21 >> 3 == -3 
-  * // in binary: 11111111 11111111 11111111 11101011 >> 3 == 
+  * -21 >> 3 == -3
+  * // in binary: 11111111 11111111 11111111 11101011 >> 3 ==
   * //            11111111 11111111 11111111 11111101
   * }}}
   */
@@ -96,8 +96,8 @@ final class Int extends AnyVal {
   *         filling in the right bits with the same value as the left-most bit of this.
   *         The effect of this is to retain the sign of the value.
   * @example {{{
-  * -21 >> 3 == -3 
-  * // in binary: 11111111 11111111 11111111 11101011 >> 3 == 
+  * -21 >> 3 == -3
+  * // in binary: 11111111 11111111 11111111 11101011 >> 3 ==
   * //            11111111 11111111 11111111 11111101
   * }}}
   */
@@ -281,9 +281,9 @@ final class Int extends AnyVal {
   * @return the bitwise OR of this value and x
   * @example {{{
   * (0xf0 | 0xaa) == 0xfa
-  * // in binary:   11110000 
-  * //            | 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            | 10101010
+  * //              --------
   * //              11111010
   * }}}
   */
@@ -292,9 +292,9 @@ final class Int extends AnyVal {
   * @return the bitwise OR of this value and x
   * @example {{{
   * (0xf0 | 0xaa) == 0xfa
-  * // in binary:   11110000 
-  * //            | 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            | 10101010
+  * //              --------
   * //              11111010
   * }}}
   */
@@ -303,9 +303,9 @@ final class Int extends AnyVal {
   * @return the bitwise OR of this value and x
   * @example {{{
   * (0xf0 | 0xaa) == 0xfa
-  * // in binary:   11110000 
-  * //            | 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            | 10101010
+  * //              --------
   * //              11111010
   * }}}
   */
@@ -314,9 +314,9 @@ final class Int extends AnyVal {
   * @return the bitwise OR of this value and x
   * @example {{{
   * (0xf0 | 0xaa) == 0xfa
-  * // in binary:   11110000 
-  * //            | 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            | 10101010
+  * //              --------
   * //              11111010
   * }}}
   */
@@ -325,9 +325,9 @@ final class Int extends AnyVal {
   * @return the bitwise OR of this value and x
   * @example {{{
   * (0xf0 | 0xaa) == 0xfa
-  * // in binary:   11110000 
-  * //            | 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            | 10101010
+  * //              --------
   * //              11111010
   * }}}
   */
@@ -337,9 +337,9 @@ final class Int extends AnyVal {
   * @return the bitwise AND of this value and x
   * @example {{{
   * (0xf0 & 0xaa) == 0xa0
-  * // in binary:   11110000 
-  * //            & 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            & 10101010
+  * //              --------
   * //              10100000
   * }}}
   */
@@ -348,9 +348,9 @@ final class Int extends AnyVal {
   * @return the bitwise AND of this value and x
   * @example {{{
   * (0xf0 & 0xaa) == 0xa0
-  * // in binary:   11110000 
-  * //            & 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            & 10101010
+  * //              --------
   * //              10100000
   * }}}
   */
@@ -359,9 +359,9 @@ final class Int extends AnyVal {
   * @return the bitwise AND of this value and x
   * @example {{{
   * (0xf0 & 0xaa) == 0xa0
-  * // in binary:   11110000 
-  * //            & 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            & 10101010
+  * //              --------
   * //              10100000
   * }}}
   */
@@ -370,9 +370,9 @@ final class Int extends AnyVal {
   * @return the bitwise AND of this value and x
   * @example {{{
   * (0xf0 & 0xaa) == 0xa0
-  * // in binary:   11110000 
-  * //            & 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            & 10101010
+  * //              --------
   * //              10100000
   * }}}
   */
@@ -381,9 +381,9 @@ final class Int extends AnyVal {
   * @return the bitwise AND of this value and x
   * @example {{{
   * (0xf0 & 0xaa) == 0xa0
-  * // in binary:   11110000 
-  * //            & 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            & 10101010
+  * //              --------
   * //              10100000
   * }}}
   */
@@ -393,9 +393,9 @@ final class Int extends AnyVal {
   * @return the bitwise XOR of this value and x
   * @example {{{
   * (0xf0 ^ 0xaa) == 0x5a
-  * // in binary:   11110000 
-  * //            ^ 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            ^ 10101010
+  * //              --------
   * //              01011010
   * }}}
   */
@@ -404,9 +404,9 @@ final class Int extends AnyVal {
   * @return the bitwise XOR of this value and x
   * @example {{{
   * (0xf0 ^ 0xaa) == 0x5a
-  * // in binary:   11110000 
-  * //            ^ 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            ^ 10101010
+  * //              --------
   * //              01011010
   * }}}
   */
@@ -415,9 +415,9 @@ final class Int extends AnyVal {
   * @return the bitwise XOR of this value and x
   * @example {{{
   * (0xf0 ^ 0xaa) == 0x5a
-  * // in binary:   11110000 
-  * //            ^ 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            ^ 10101010
+  * //              --------
   * //              01011010
   * }}}
   */
@@ -426,9 +426,9 @@ final class Int extends AnyVal {
   * @return the bitwise XOR of this value and x
   * @example {{{
   * (0xf0 ^ 0xaa) == 0x5a
-  * // in binary:   11110000 
-  * //            ^ 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            ^ 10101010
+  * //              --------
   * //              01011010
   * }}}
   */
@@ -437,9 +437,9 @@ final class Int extends AnyVal {
   * @return the bitwise XOR of this value and x
   * @example {{{
   * (0xf0 ^ 0xaa) == 0x5a
-  * // in binary:   11110000 
-  * //            ^ 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            ^ 10101010
+  * //              --------
   * //              01011010
   * }}}
   */
diff --git a/src/library/scala/Long.scala b/src/library/scala/Long.scala
index e734c92112..ce8618c22a 100644
--- a/src/library/scala/Long.scala
+++ b/src/library/scala/Long.scala
@@ -30,7 +30,7 @@ final class Long extends AnyVal {
  * @return the bitwise negation of this value
  * @example {{{
  * ~5 == -6
- * // in binary: ~00000101 == 
+ * // in binary: ~00000101 ==
  * //             11111010
  * }}}
  */
@@ -60,22 +60,22 @@ final class Long extends AnyVal {
   def <<(x: Long): Long = sys.error("stub")
   /**
   * @return this value bit-shifted right by the specified number of bits,
-  *         filling the new left bits with zeroes. 
+  *         filling the new left bits with zeroes.
   * @example {{{ 21 >>> 3 == 2 // in binary: 010101 >>> 3 == 010 }}}
   * @example {{{
-  * -21 >>> 3 == 536870909 
-  * // in binary: 11111111 11111111 11111111 11101011 >>> 3 == 
+  * -21 >>> 3 == 536870909
+  * // in binary: 11111111 11111111 11111111 11101011 >>> 3 ==
   * //            00011111 11111111 11111111 11111101
   * }}}
   */
   def >>>(x: Int): Long = sys.error("stub")
   /**
   * @return this value bit-shifted right by the specified number of bits,
-  *         filling the new left bits with zeroes. 
+  *         filling the new left bits with zeroes.
   * @example {{{ 21 >>> 3 == 2 // in binary: 010101 >>> 3 == 010 }}}
   * @example {{{
-  * -21 >>> 3 == 536870909 
-  * // in binary: 11111111 11111111 11111111 11101011 >>> 3 == 
+  * -21 >>> 3 == 536870909
+  * // in binary: 11111111 11111111 11111111 11101011 >>> 3 ==
   * //            00011111 11111111 11111111 11111101
   * }}}
   */
@@ -85,8 +85,8 @@ final class Long extends AnyVal {
   *         filling in the right bits with the same value as the left-most bit of this.
   *         The effect of this is to retain the sign of the value.
   * @example {{{
-  * -21 >> 3 == -3 
-  * // in binary: 11111111 11111111 11111111 11101011 >> 3 == 
+  * -21 >> 3 == -3
+  * // in binary: 11111111 11111111 11111111 11101011 >> 3 ==
   * //            11111111 11111111 11111111 11111101
   * }}}
   */
@@ -96,8 +96,8 @@ final class Long extends AnyVal {
   *         filling in the right bits with the same value as the left-most bit of this.
   *         The effect of this is to retain the sign of the value.
   * @example {{{
-  * -21 >> 3 == -3 
-  * // in binary: 11111111 11111111 11111111 11101011 >> 3 == 
+  * -21 >> 3 == -3
+  * // in binary: 11111111 11111111 11111111 11101011 >> 3 ==
   * //            11111111 11111111 11111111 11111101
   * }}}
   */
@@ -281,9 +281,9 @@ final class Long extends AnyVal {
   * @return the bitwise OR of this value and x
   * @example {{{
   * (0xf0 | 0xaa) == 0xfa
-  * // in binary:   11110000 
-  * //            | 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            | 10101010
+  * //              --------
   * //              11111010
   * }}}
   */
@@ -292,9 +292,9 @@ final class Long extends AnyVal {
   * @return the bitwise OR of this value and x
   * @example {{{
   * (0xf0 | 0xaa) == 0xfa
-  * // in binary:   11110000 
-  * //            | 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            | 10101010
+  * //              --------
   * //              11111010
   * }}}
   */
@@ -303,9 +303,9 @@ final class Long extends AnyVal {
   * @return the bitwise OR of this value and x
   * @example {{{
   * (0xf0 | 0xaa) == 0xfa
-  * // in binary:   11110000 
-  * //            | 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            | 10101010
+  * //              --------
   * //              11111010
   * }}}
   */
@@ -314,9 +314,9 @@ final class Long extends AnyVal {
   * @return the bitwise OR of this value and x
   * @example {{{
   * (0xf0 | 0xaa) == 0xfa
-  * // in binary:   11110000 
-  * //            | 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            | 10101010
+  * //              --------
   * //              11111010
   * }}}
   */
@@ -325,9 +325,9 @@ final class Long extends AnyVal {
   * @return the bitwise OR of this value and x
   * @example {{{
   * (0xf0 | 0xaa) == 0xfa
-  * // in binary:   11110000 
-  * //            | 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            | 10101010
+  * //              --------
   * //              11111010
   * }}}
   */
@@ -337,9 +337,9 @@ final class Long extends AnyVal {
   * @return the bitwise AND of this value and x
   * @example {{{
   * (0xf0 & 0xaa) == 0xa0
-  * // in binary:   11110000 
-  * //            & 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            & 10101010
+  * //              --------
   * //              10100000
   * }}}
   */
@@ -348,9 +348,9 @@ final class Long extends AnyVal {
   * @return the bitwise AND of this value and x
   * @example {{{
   * (0xf0 & 0xaa) == 0xa0
-  * // in binary:   11110000 
-  * //            & 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            & 10101010
+  * //              --------
   * //              10100000
   * }}}
   */
@@ -359,9 +359,9 @@ final class Long extends AnyVal {
   * @return the bitwise AND of this value and x
   * @example {{{
   * (0xf0 & 0xaa) == 0xa0
-  * // in binary:   11110000 
-  * //            & 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            & 10101010
+  * //              --------
   * //              10100000
   * }}}
   */
@@ -370,9 +370,9 @@ final class Long extends AnyVal {
   * @return the bitwise AND of this value and x
   * @example {{{
   * (0xf0 & 0xaa) == 0xa0
-  * // in binary:   11110000 
-  * //            & 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            & 10101010
+  * //              --------
   * //              10100000
   * }}}
   */
@@ -381,9 +381,9 @@ final class Long extends AnyVal {
   * @return the bitwise AND of this value and x
   * @example {{{
   * (0xf0 & 0xaa) == 0xa0
-  * // in binary:   11110000 
-  * //            & 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            & 10101010
+  * //              --------
   * //              10100000
   * }}}
   */
@@ -393,9 +393,9 @@ final class Long extends AnyVal {
   * @return the bitwise XOR of this value and x
   * @example {{{
   * (0xf0 ^ 0xaa) == 0x5a
-  * // in binary:   11110000 
-  * //            ^ 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            ^ 10101010
+  * //              --------
   * //              01011010
   * }}}
   */
@@ -404,9 +404,9 @@ final class Long extends AnyVal {
   * @return the bitwise XOR of this value and x
   * @example {{{
   * (0xf0 ^ 0xaa) == 0x5a
-  * // in binary:   11110000 
-  * //            ^ 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            ^ 10101010
+  * //              --------
   * //              01011010
   * }}}
   */
@@ -415,9 +415,9 @@ final class Long extends AnyVal {
   * @return the bitwise XOR of this value and x
   * @example {{{
   * (0xf0 ^ 0xaa) == 0x5a
-  * // in binary:   11110000 
-  * //            ^ 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            ^ 10101010
+  * //              --------
   * //              01011010
   * }}}
   */
@@ -426,9 +426,9 @@ final class Long extends AnyVal {
   * @return the bitwise XOR of this value and x
   * @example {{{
   * (0xf0 ^ 0xaa) == 0x5a
-  * // in binary:   11110000 
-  * //            ^ 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            ^ 10101010
+  * //              --------
   * //              01011010
   * }}}
   */
@@ -437,9 +437,9 @@ final class Long extends AnyVal {
   * @return the bitwise XOR of this value and x
   * @example {{{
   * (0xf0 ^ 0xaa) == 0x5a
-  * // in binary:   11110000 
-  * //            ^ 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            ^ 10101010
+  * //              --------
   * //              01011010
   * }}}
   */
diff --git a/src/library/scala/Short.scala b/src/library/scala/Short.scala
index 98e227d992..5664c3b44c 100644
--- a/src/library/scala/Short.scala
+++ b/src/library/scala/Short.scala
@@ -30,7 +30,7 @@ final class Short extends AnyVal {
  * @return the bitwise negation of this value
  * @example {{{
  * ~5 == -6
- * // in binary: ~00000101 == 
+ * // in binary: ~00000101 ==
  * //             11111010
  * }}}
  */
@@ -60,22 +60,22 @@ final class Short extends AnyVal {
   def <<(x: Long): Int = sys.error("stub")
   /**
   * @return this value bit-shifted right by the specified number of bits,
-  *         filling the new left bits with zeroes. 
+  *         filling the new left bits with zeroes.
   * @example {{{ 21 >>> 3 == 2 // in binary: 010101 >>> 3 == 010 }}}
   * @example {{{
-  * -21 >>> 3 == 536870909 
-  * // in binary: 11111111 11111111 11111111 11101011 >>> 3 == 
+  * -21 >>> 3 == 536870909
+  * // in binary: 11111111 11111111 11111111 11101011 >>> 3 ==
   * //            00011111 11111111 11111111 11111101
   * }}}
   */
   def >>>(x: Int): Int = sys.error("stub")
   /**
   * @return this value bit-shifted right by the specified number of bits,
-  *         filling the new left bits with zeroes. 
+  *         filling the new left bits with zeroes.
   * @example {{{ 21 >>> 3 == 2 // in binary: 010101 >>> 3 == 010 }}}
   * @example {{{
-  * -21 >>> 3 == 536870909 
-  * // in binary: 11111111 11111111 11111111 11101011 >>> 3 == 
+  * -21 >>> 3 == 536870909
+  * // in binary: 11111111 11111111 11111111 11101011 >>> 3 ==
   * //            00011111 11111111 11111111 11111101
   * }}}
   */
@@ -85,8 +85,8 @@ final class Short extends AnyVal {
   *         filling in the right bits with the same value as the left-most bit of this.
   *         The effect of this is to retain the sign of the value.
   * @example {{{
-  * -21 >> 3 == -3 
-  * // in binary: 11111111 11111111 11111111 11101011 >> 3 == 
+  * -21 >> 3 == -3
+  * // in binary: 11111111 11111111 11111111 11101011 >> 3 ==
   * //            11111111 11111111 11111111 11111101
   * }}}
   */
@@ -96,8 +96,8 @@ final class Short extends AnyVal {
   *         filling in the right bits with the same value as the left-most bit of this.
   *         The effect of this is to retain the sign of the value.
   * @example {{{
-  * -21 >> 3 == -3 
-  * // in binary: 11111111 11111111 11111111 11101011 >> 3 == 
+  * -21 >> 3 == -3
+  * // in binary: 11111111 11111111 11111111 11101011 >> 3 ==
   * //            11111111 11111111 11111111 11111101
   * }}}
   */
@@ -281,9 +281,9 @@ final class Short extends AnyVal {
   * @return the bitwise OR of this value and x
   * @example {{{
   * (0xf0 | 0xaa) == 0xfa
-  * // in binary:   11110000 
-  * //            | 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            | 10101010
+  * //              --------
   * //              11111010
   * }}}
   */
@@ -292,9 +292,9 @@ final class Short extends AnyVal {
   * @return the bitwise OR of this value and x
   * @example {{{
   * (0xf0 | 0xaa) == 0xfa
-  * // in binary:   11110000 
-  * //            | 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            | 10101010
+  * //              --------
   * //              11111010
   * }}}
   */
@@ -303,9 +303,9 @@ final class Short extends AnyVal {
   * @return the bitwise OR of this value and x
   * @example {{{
   * (0xf0 | 0xaa) == 0xfa
-  * // in binary:   11110000 
-  * //            | 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            | 10101010
+  * //              --------
   * //              11111010
   * }}}
   */
@@ -314,9 +314,9 @@ final class Short extends AnyVal {
   * @return the bitwise OR of this value and x
   * @example {{{
   * (0xf0 | 0xaa) == 0xfa
-  * // in binary:   11110000 
-  * //            | 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            | 10101010
+  * //              --------
   * //              11111010
   * }}}
   */
@@ -325,9 +325,9 @@ final class Short extends AnyVal {
   * @return the bitwise OR of this value and x
   * @example {{{
   * (0xf0 | 0xaa) == 0xfa
-  * // in binary:   11110000 
-  * //            | 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            | 10101010
+  * //              --------
   * //              11111010
   * }}}
   */
@@ -337,9 +337,9 @@ final class Short extends AnyVal {
   * @return the bitwise AND of this value and x
   * @example {{{
   * (0xf0 & 0xaa) == 0xa0
-  * // in binary:   11110000 
-  * //            & 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            & 10101010
+  * //              --------
   * //              10100000
   * }}}
   */
@@ -348,9 +348,9 @@ final class Short extends AnyVal {
   * @return the bitwise AND of this value and x
   * @example {{{
   * (0xf0 & 0xaa) == 0xa0
-  * // in binary:   11110000 
-  * //            & 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            & 10101010
+  * //              --------
   * //              10100000
   * }}}
   */
@@ -359,9 +359,9 @@ final class Short extends AnyVal {
   * @return the bitwise AND of this value and x
   * @example {{{
   * (0xf0 & 0xaa) == 0xa0
-  * // in binary:   11110000 
-  * //            & 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            & 10101010
+  * //              --------
   * //              10100000
   * }}}
   */
@@ -370,9 +370,9 @@ final class Short extends AnyVal {
   * @return the bitwise AND of this value and x
   * @example {{{
   * (0xf0 & 0xaa) == 0xa0
-  * // in binary:   11110000 
-  * //            & 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            & 10101010
+  * //              --------
   * //              10100000
   * }}}
   */
@@ -381,9 +381,9 @@ final class Short extends AnyVal {
   * @return the bitwise AND of this value and x
   * @example {{{
   * (0xf0 & 0xaa) == 0xa0
-  * // in binary:   11110000 
-  * //            & 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            & 10101010
+  * //              --------
   * //              10100000
   * }}}
   */
@@ -393,9 +393,9 @@ final class Short extends AnyVal {
   * @return the bitwise XOR of this value and x
   * @example {{{
   * (0xf0 ^ 0xaa) == 0x5a
-  * // in binary:   11110000 
-  * //            ^ 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            ^ 10101010
+  * //              --------
   * //              01011010
   * }}}
   */
@@ -404,9 +404,9 @@ final class Short extends AnyVal {
   * @return the bitwise XOR of this value and x
   * @example {{{
   * (0xf0 ^ 0xaa) == 0x5a
-  * // in binary:   11110000 
-  * //            ^ 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            ^ 10101010
+  * //              --------
   * //              01011010
   * }}}
   */
@@ -415,9 +415,9 @@ final class Short extends AnyVal {
   * @return the bitwise XOR of this value and x
   * @example {{{
   * (0xf0 ^ 0xaa) == 0x5a
-  * // in binary:   11110000 
-  * //            ^ 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            ^ 10101010
+  * //              --------
   * //              01011010
   * }}}
   */
@@ -426,9 +426,9 @@ final class Short extends AnyVal {
   * @return the bitwise XOR of this value and x
   * @example {{{
   * (0xf0 ^ 0xaa) == 0x5a
-  * // in binary:   11110000 
-  * //            ^ 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            ^ 10101010
+  * //              --------
   * //              01011010
   * }}}
   */
@@ -437,9 +437,9 @@ final class Short extends AnyVal {
   * @return the bitwise XOR of this value and x
   * @example {{{
   * (0xf0 ^ 0xaa) == 0x5a
-  * // in binary:   11110000 
-  * //            ^ 10101010 
-  * //              -------- 
+  * // in binary:   11110000
+  * //            ^ 10101010
+  * //              --------
   * //              01011010
   * }}}
   */