summaryrefslogtreecommitdiff
path: root/src/library/scala/collection/immutable/List.scala
diff options
context:
space:
mode:
authorEugene Burmako <xeno.by@gmail.com>2012-09-14 11:54:32 -0700
committerEugene Burmako <xeno.by@gmail.com>2012-09-14 11:54:32 -0700
commit83c1b1062957e50e5336c1b3409e54e0a5cce275 (patch)
tree6db61304dacb4f59fb53859e7ef0afc6e937e9ff /src/library/scala/collection/immutable/List.scala
parentf68201c469725c255ae2786f0ac1e37bc5f30a7a (diff)
parent55b609458fd14de248c21132a3e4a4672de4ce4b (diff)
downloadscala-83c1b1062957e50e5336c1b3409e54e0a5cce275.tar.gz
scala-83c1b1062957e50e5336c1b3409e54e0a5cce275.tar.bz2
scala-83c1b1062957e50e5336c1b3409e54e0a5cce275.zip
Merge pull request #1303 from paulp/210-relative-names
Eliminate breaking relative names in source.
Diffstat (limited to 'src/library/scala/collection/immutable/List.scala')
-rw-r--r--src/library/scala/collection/immutable/List.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/collection/immutable/List.scala b/src/library/scala/collection/immutable/List.scala
index 87b58005cf..b77e8b4c7c 100644
--- a/src/library/scala/collection/immutable/List.scala
+++ b/src/library/scala/collection/immutable/List.scala
@@ -13,7 +13,7 @@ package immutable
import generic._
import mutable.{Builder, ListBuffer}
-import annotation.tailrec
+import scala.annotation.tailrec
import java.io._
/** A class for immutable linked lists representing ordered collections
@@ -330,7 +330,7 @@ case object Nil extends List[Nothing] {
throw new UnsupportedOperationException("tail of empty list")
// Removal of equals method here might lead to an infinite recursion similar to IntMap.equals.
override def equals(that: Any) = that match {
- case that1: collection.GenSeq[_] => that1.isEmpty
+ case that1: scala.collection.GenSeq[_] => that1.isEmpty
case _ => false
}
}