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.

2 files changed, 5 insertions, 5 deletions

diff --git a/src/scalap/scala/tools/scalap/scalax/rules/SeqRule.scala b/src/scalap/scala/tools/scalap/scalax/rules/SeqRule.scala
index 34f52a1e19..51a789e041 100644
--- a/src/scalap/scala/tools/scalap/scalax/rules/SeqRule.scala
+++ b/src/scalap/scala/tools/scalap/scalax/rules/SeqRule.scala
@@ -82,7 +82,7 @@ class SeqRule[S, +A, +X](rule : Rule[S, S, A, X]) {
 
   /** Repeats this rule num times */
   def times(num : Int) : Rule[S, S, Seq[A], X] = from[S] {
-    val result = new collection.mutable.ArraySeq[A](num)
+    val result = new scala.collection.mutable.ArraySeq[A](num)
     // more compact using HoF but written this way so it's tail-recursive
     def rep(i : Int, in : S) : Result[S, Seq[A], X] = {
       if (i == num) Success(in, result)
diff --git a/src/scalap/scala/tools/scalap/scalax/rules/package.scala b/src/scalap/scala/tools/scalap/scalax/rules/package.scala
index 324e87435e..b1cc18f90b 100644
--- a/src/scalap/scala/tools/scalap/scalax/rules/package.scala
+++ b/src/scalap/scala/tools/scalap/scalax/rules/package.scala
@@ -2,8 +2,8 @@ package scala.tools.scalap
 package scalax
 
 package object rules {
-  implicit lazy val higherKinds         = language.higherKinds
-  implicit lazy val postfixOps          = language.postfixOps
-  implicit lazy val implicitConversions = language.implicitConversions
-  implicit lazy val reflectiveCalls     = language.reflectiveCalls
+  implicit lazy val higherKinds         = scala.language.higherKinds
+  implicit lazy val postfixOps          = scala.language.postfixOps
+  implicit lazy val implicitConversions = scala.language.implicitConversions
+  implicit lazy val reflectiveCalls     = scala.language.reflectiveCalls
 }