summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2009-07-26 21:21:12 +0000
committerPaul Phillips <paulp@improving.org>2009-07-26 21:21:12 +0000
commit68c289a95f70c5cd60f77dc251b3631504d3b59c (patch)
tree5664ac0c53d921e4ad8402c5f42e7068b132f8c1 /src/library
parent22edfb28815f785a40e9444e5c16d3820eec1b02 (diff)
downloadscala-68c289a95f70c5cd60f77dc251b3631504d3b59c.tar.gz
scala-68c289a95f70c5cd60f77dc251b3631504d3b59c.tar.bz2
scala-68c289a95f70c5cd60f77dc251b3631504d3b59c.zip
Changed toSet to return immutable.Set, addresse...
Changed toSet to return immutable.Set, addresses #2200.
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/collection/generic/TraversableProxyTemplate.scala2
-rw-r--r--src/library/scala/collection/generic/TraversableTemplate.scala3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/library/scala/collection/generic/TraversableProxyTemplate.scala b/src/library/scala/collection/generic/TraversableProxyTemplate.scala
index 3ab602fb35..e27fba086f 100644
--- a/src/library/scala/collection/generic/TraversableProxyTemplate.scala
+++ b/src/library/scala/collection/generic/TraversableProxyTemplate.scala
@@ -73,7 +73,7 @@ trait TraversableProxyTemplate[+A, +This <: TraversableTemplate[A, This] with Tr
override def toIterable: Iterable[A] = self.toIterable
override def toSequence: Sequence[A] = self.toSequence
override def toStream: Stream[A] = self.toStream
- override def toSet[B >: A]: Set[B] = self.toSet
+ override def toSet[B >: A]: immutable.Set[B] = self.toSet
// override def sortWith(lt : (A,A) => Boolean): This = self.sortWith(lt)
override def mkString(start: String, sep: String, end: String): String = self.mkString(start, sep, end)
override def mkString(sep: String): String = self.mkString(sep)
diff --git a/src/library/scala/collection/generic/TraversableTemplate.scala b/src/library/scala/collection/generic/TraversableTemplate.scala
index 21273a11bd..6e2c32e251 100644
--- a/src/library/scala/collection/generic/TraversableTemplate.scala
+++ b/src/library/scala/collection/generic/TraversableTemplate.scala
@@ -713,7 +713,8 @@ self =>
/** Returns a set with all unique elements in this traversable object.
*/
- def toSet[B >: A]: Set[B] = Set() ++ thisCollection
+ @experimental
+ def toSet[B >: A]: immutable.Set[B] = immutable.Set() ++ thisCollection
/** Sort the traversable according to the comparison function
* <code>&lt;(e1: a, e2: a) =&gt; Boolean</code>,