cleaned up collection builder framework

1 files changed, 4 insertions, 8 deletions

diff --git a/src/library/scala/collection/BitSet.scala b/src/library/scala/collection/BitSet.scala
index 2fb469e680..b7a77c63ce 100644
--- a/src/library/scala/collection/BitSet.scala
+++ b/src/library/scala/collection/BitSet.scala
@@ -15,17 +15,13 @@ import generic._
 
 /** common base class for mutable and immutable bit sets
  */
-trait BitSet extends Set[Int] with BitSetTemplate[BitSet] {
-  override def empty = BitSet.empty
+trait BitSet extends Set[Int]
+                with BitSetTemplate[BitSet] {
+  override def empty: BitSet = BitSet.empty
 }
 
 /** A factory object for bitsets */
-object BitSet {
-
-    /** The empty bitset */
+object BitSet extends BitSetFactory[BitSet] {
   val empty: BitSet = immutable.BitSet.empty
-
-  /** A bitset containing given elements */
-  def apply(elems: Int*) = immutable.BitSet.apply(elems: _*)
 }