More relative path elimination.

Some names I missed in 55b609458fd .

How one might know when one is done:

  mkdir scratch && cd scratch
  mkdir annotation beans collection compat concurrent io \
    math parallel ref reflect runtime scala sys testing \
    text tools util xml
  scalac $(find ../src/library -name '*.scala')

Until recently that would fail with about a billion errors. When it
compiles, that's when you're done.  And that's where this commit
takes us, for src/library at least.

5 files changed, 6 insertions, 6 deletions

diff --git a/src/reflect/scala/reflect/api/FrontEnds.scala b/src/reflect/scala/reflect/api/FrontEnds.scala
index a27450d49d..61ea227c47 100644
--- a/src/reflect/scala/reflect/api/FrontEnds.scala
+++ b/src/reflect/scala/reflect/api/FrontEnds.scala
@@ -24,7 +24,7 @@ trait FrontEnds {
     def hasWarnings = WARNING.count > 0
 
     case class Info(val pos: Position, val msg: String, val severity: Severity)
-    val infos = new collection.mutable.LinkedHashSet[Info]
+    val infos = new scala.collection.mutable.LinkedHashSet[Info]
 
     /** Handles incoming info */
     def log(pos: Position, msg: String, severity: Severity) {
@@ -67,4 +67,4 @@ trait FrontEnds {
    */
   // todo. untangle warningsAsErrors from Reporters. I don't feel like moving this flag here!
   def mkConsoleFrontEnd(minSeverity: Int = 1): FrontEnd
-}
\ No newline at end of file
+}
diff --git a/src/reflect/scala/reflect/internal/Importers.scala b/src/reflect/scala/reflect/internal/Importers.scala
index 87058df732..c116928d37 100644
--- a/src/reflect/scala/reflect/internal/Importers.scala
+++ b/src/reflect/scala/reflect/internal/Importers.scala
@@ -32,7 +32,7 @@ trait Importers extends api.Importers { self: SymbolTable =>
     // fixups and maps prevent stackoverflows in importer
     var pendingSyms = 0
     var pendingTpes = 0
-    lazy val fixups = collection.mutable.MutableList[Function0[Unit]]()
+    lazy val fixups = scala.collection.mutable.MutableList[Function0[Unit]]()
     def addFixup(fixup: => Unit): Unit = fixups += (() => fixup)
     def tryFixup(): Unit = {
       if (pendingSyms == 0 && pendingTpes == 0) {
diff --git a/src/reflect/scala/reflect/internal/Printers.scala b/src/reflect/scala/reflect/internal/Printers.scala
index c23d22efab..4c423e0bc2 100644
--- a/src/reflect/scala/reflect/internal/Printers.scala
+++ b/src/reflect/scala/reflect/internal/Printers.scala
@@ -664,7 +664,7 @@ trait Printers extends api.Printers { self: SymbolTable =>
   def show(flags: FlagSet): String = {
     if (flags == NoFlags) nme.NoFlags.toString
     else {
-      val s_flags = new collection.mutable.ListBuffer[String]
+      val s_flags = new scala.collection.mutable.ListBuffer[String]
       def hasFlag(left: Long, right: Long): Boolean = (left & right) != 0
       for (i <- 0 to 63 if hasFlag(flags, 1L << i))
         s_flags += flagToString(1L << i).replace("<", "").replace(">", "").toUpperCase
diff --git a/src/reflect/scala/reflect/internal/Symbols.scala b/src/reflect/scala/reflect/internal/Symbols.scala
index be55b72623..b04cf4ff9f 100644
--- a/src/reflect/scala/reflect/internal/Symbols.scala
+++ b/src/reflect/scala/reflect/internal/Symbols.scala
@@ -28,7 +28,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
   //protected var activeLocks = 0
 
   /** Used for debugging only */
-  //protected var lockedSyms = collection.immutable.Set[Symbol]()
+  //protected var lockedSyms = scala.collection.immutable.Set[Symbol]()
 
   /** Used to keep track of the recursion depth on locked symbols */
   private var recursionTable = immutable.Map.empty[Symbol, Int]
diff --git a/src/reflect/scala/reflect/internal/Trees.scala b/src/reflect/scala/reflect/internal/Trees.scala
index b20c315a2a..5a6d6ce7c7 100644
--- a/src/reflect/scala/reflect/internal/Trees.scala
+++ b/src/reflect/scala/reflect/internal/Trees.scala
@@ -137,7 +137,7 @@ trait Trees extends api.Trees { self: SymbolTable =>
     override def freeTypes: List[FreeTypeSymbol] = freeSyms[FreeTypeSymbol](_.isFreeType, _.typeSymbol)
 
     private def freeSyms[S <: Symbol](isFree: Symbol => Boolean, symOfType: Type => Symbol): List[S] = {
-      val s = collection.mutable.LinkedHashSet[S]()
+      val s = scala.collection.mutable.LinkedHashSet[S]()
       def addIfFree(sym: Symbol): Unit = if (sym != null && isFree(sym)) s += sym.asInstanceOf[S]
       for (t <- this) {
         addIfFree(t.symbol)