diff options
author | Martin Odersky <odersky@gmail.com> | 2009-09-25 16:20:13 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2009-09-25 16:20:13 +0000 |
commit | 4a727f3b01d0fa27ef51f7dba472116e021e3445 (patch) | |
tree | c9ab55ea7fe6051455271b23e9fbfc2f313015c0 /src/library/scala/collection/immutable/Iterable.scala | |
parent | e31f18094dfba97c80871869a037172ff2c9c1c2 (diff) | |
download | scala-4a727f3b01d0fa27ef51f7dba472116e021e3445.tar.gz scala-4a727f3b01d0fa27ef51f7dba472116e021e3445.tar.bz2 scala-4a727f3b01d0fa27ef51f7dba472116e021e3445.zip |
Collections refactoring.
Diffstat (limited to 'src/library/scala/collection/immutable/Iterable.scala')
-rw-r--r-- | src/library/scala/collection/immutable/Iterable.scala | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/library/scala/collection/immutable/Iterable.scala b/src/library/scala/collection/immutable/Iterable.scala index 4a85779443..ac4f7701b5 100644 --- a/src/library/scala/collection/immutable/Iterable.scala +++ b/src/library/scala/collection/immutable/Iterable.scala @@ -9,12 +9,13 @@ // $Id$ -package scala.collection.immutable +package scala.collection +package immutable -import scala.collection.generic._ -import scala.collection.mutable +import generic._ +import mutable.Builder -/** A subtrait of collection.Iterable which represents iterables +/** A subtrait of scala.collection.Iterable which represents iterables * that cannot be mutated. * * @author Matthias Zenger @@ -22,10 +23,10 @@ import scala.collection.mutable * @version 2.8 */ trait Iterable[+A] extends Traversable[A] - with collection.Iterable[A] - with TraversableClass[A, Iterable] - with IterableTemplate[A, Iterable[A]] { - override def companion: Companion[Iterable] = Iterable + with scala.collection.Iterable[A] + with GenericTraversableTemplate[A, Iterable] + with IterableLike[A, Iterable[A]] { + override def companion: GenericCompanion[Iterable] = Iterable } /** A factory object for the trait <code>Iterable</code>. |