summaryrefslogtreecommitdiff
path: root/src/library/scala/Enumeration.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2010-12-07 19:39:31 +0000
committerPaul Phillips <paulp@improving.org>2010-12-07 19:39:31 +0000
commit60a88e05b69af937f70101e5a4349520fabf44bf (patch)
treeee053607f20d03450227385f78676932ee127ac9 /src/library/scala/Enumeration.scala
parent32454d61e7a310b2d2c415650adb107571f1210b (diff)
downloadscala-60a88e05b69af937f70101e5a4349520fabf44bf.tar.gz
scala-60a88e05b69af937f70101e5a4349520fabf44bf.tar.bz2
scala-60a88e05b69af937f70101e5a4349520fabf44bf.zip
Extricated Addable and AddingBuilder from the f...
Extricated Addable and AddingBuilder from the few classes still utilizing them and deprecated both. Closes #4059. Already endorsed by odersky, so no review.
Diffstat (limited to 'src/library/scala/Enumeration.scala')
-rw-r--r--src/library/scala/Enumeration.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/Enumeration.scala b/src/library/scala/Enumeration.scala
index fa786ddb0e..7039fec4bf 100644
--- a/src/library/scala/Enumeration.scala
+++ b/src/library/scala/Enumeration.scala
@@ -253,7 +253,7 @@ abstract class Enumeration(initial: Int, names: String*) extends Serializable {
/** A factory object for value sets */
object ValueSet {
- import mutable.{ Builder, AddingBuilder }
+ import mutable.{ Builder, SetBuilder }
import generic.CanBuildFrom
/** The empty value set */
@@ -261,7 +261,7 @@ abstract class Enumeration(initial: Int, names: String*) extends Serializable {
/** A value set consisting of given elements */
def apply(elems: Value*): ValueSet = empty ++ elems
/** A builder object for value sets */
- def newBuilder: Builder[Value, ValueSet] = new AddingBuilder(empty)
+ def newBuilder: Builder[Value, ValueSet] = new SetBuilder(empty)
/** The implicit builder for value sets */
implicit def canBuildFrom: CanBuildFrom[ValueSet, Value, ValueSet] =
new CanBuildFrom[ValueSet, Value, ValueSet] {