Clean up imports

Honor the new scheme where any explicit import of a
root import will disable the root import.

Author: odersky

src/dotty/tools/dotc/ast/Trees.scala

@@ -32,7 +32,7 @@ object Trees {
   /** Property key for trees with documentation strings attached */
   val DocComment = new Property.Key[Comment]
 
-   @sharable private var nextId = 0 // for debugging
+  @sharable private var nextId = 0 // for debugging
 
   type LazyTree = AnyRef     /* really: Tree | Lazy[Tree] */
   type LazyTreeList = AnyRef /* really: List[Tree] | Lazy[List[Tree]] */
@@ -60,18 +60,18 @@ object Trees {
                                         with Cloneable {
 
     if (Stats.enabled) ntrees += 1
-    
+
     private def nxId = {
       nextId += 1
       //assert(nextId != 199, this)
-      nextId      
+      nextId
     }
 
     /** A unique identifier for this tree. Used for debugging, and potentially
      *  tracking presentation compiler interactions
      */
     private var myUniqueId: Int = nxId
-    
+
     def uniqueId = myUniqueId
 
     /** The type  constructor at the root of the tree */
@@ -192,7 +192,7 @@ object Trees {
 
     override def hashCode(): Int = uniqueId // for debugging; was: System.identityHashCode(this)
     override def equals(that: Any) = this eq that.asInstanceOf[AnyRef]
-    
+
     override def clone: Tree[T] = {
       val tree = super.clone.asInstanceOf[Tree[T]]
       tree.myUniqueId = nxId

src/dotty/tools/dotc/core/Types.scala

@@ -2524,7 +2524,7 @@ object Types {
       case _: MethodType => true
       case _ => false
     }
-    
+
     /** Is this polytype a higher-kinded type lambda as opposed to a polymorphic?
      *  method type? Only type lambdas get created with variances, that's how we can tell.
      */

src/dotty/tools/dotc/repl/CompilingInterpreter.scala

@@ -6,7 +6,7 @@ import java.io.{
   File, PrintWriter, PrintStream, StringWriter, Writer, OutputStream,
   ByteArrayOutputStream => ByteOutputStream
 }
-import java.lang.{Class, ClassLoader}
+import java.lang.{Class, ClassLoader, Thread, System, StringBuffer}
 import java.net.{URL, URLClassLoader}
 
 import scala.collection.immutable.ListSet

src/dotty/tools/dotc/repl/InterpreterLoop.scala

@@ -4,7 +4,7 @@ package repl
 
 import java.io.{BufferedReader, File, FileReader, PrintWriter}
 import java.io.IOException
-import java.lang.{ClassLoader, System}
+import java.lang.{ClassLoader, System, Thread}
 import scala.concurrent.{Future, Await}
 import scala.concurrent.duration.Duration
 import reporting.Reporter

src/dotty/tools/dotc/transform/CollectEntryPoints.scala

@@ -9,7 +9,6 @@ import dotty.tools.dotc.core.Symbols.NoSymbol
 import scala.annotation.tailrec
 import dotty.tools.dotc.core._
 import Symbols._
-import scala.Some
 import dotty.tools.dotc.transform.TreeTransforms.{NXTransformations, TransformerInfo, TreeTransform, TreeTransformer}
 import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc.core.Contexts.Context

src/dotty/tools/dotc/util/Chars.scala

@@ -6,7 +6,6 @@ package dotty.tools.dotc
 package util
 
 import scala.annotation.switch
-import java.lang.{ Character => JCharacter }
 import java.lang.{Character => JCharacter}
 import java.lang.Character.LETTER_NUMBER
 import java.lang.Character.LOWERCASE_LETTER
@@ -66,16 +65,16 @@ object Chars {
 
   /** Can character start an alphanumeric Scala identifier? */
   def isIdentifierStart(c: Char): Boolean =
-    (c == '_') || (c == '$') || Character.isUnicodeIdentifierStart(c)
+    (c == '_') || (c == '$') || JCharacter.isUnicodeIdentifierStart(c)
 
   /** Can character form part of an alphanumeric Scala identifier? */
   def isIdentifierPart(c: Char) =
-    (c == '$') || Character.isUnicodeIdentifierPart(c)
+    (c == '$') || JCharacter.isUnicodeIdentifierPart(c)
 
   /** Is character a math or other symbol in Unicode?  */
   def isSpecial(c: Char) = {
-    val chtp = Character.getType(c)
-    chtp == Character.MATH_SYMBOL.toInt || chtp == Character.OTHER_SYMBOL.toInt
+    val chtp = JCharacter.getType(c)
+    chtp == JCharacter.MATH_SYMBOL.toInt || chtp == JCharacter.OTHER_SYMBOL.toInt
   }
 
   private final val otherLetters = Set[Char]('\u0024', '\u005F')  // '$' and '_'