Added a bunch of bridges to make ameliorate bin...

Added a bunch of bridges to make ameliorate binary compatibility of new
collections. Review by prokopec. Review by extempore.

1 files changed, 17 insertions, 0 deletions

diff --git a/src/library/scala/collection/GenSetLike.scala b/src/library/scala/collection/GenSetLike.scala
index d45810d2e7..1c998351b4 100644
--- a/src/library/scala/collection/GenSetLike.scala
+++ b/src/library/scala/collection/GenSetLike.scala
@@ -8,6 +8,8 @@
 
 package scala.collection
 
+import annotation.bridge
+
 /** A template trait for sets which may possibly
  *  have their operations implemented in parallel.
  *
@@ -49,6 +51,9 @@ private[collection] trait GenSetLike[A, +Repr]
    */
   def intersect(that: GenSet[A]): Repr = this filter that
 
+  @bridge
+  def intersect(that: Set[A]): Repr = intersect(that: GenSet[A])
+
   /** Computes the intersection between this set and another set.
    *
    *  '''Note:'''  Same as `intersect`.
@@ -58,6 +63,9 @@ private[collection] trait GenSetLike[A, +Repr]
    */
   def &(that: GenSet[A]): Repr = this intersect that
 
+  @bridge
+  def &(that: Set[A]): Repr = &(that: GenSet[A])
+
   /** Computes the union between of set and another set.
    *
    *  @param   that  the set to form the union with.
@@ -75,6 +83,9 @@ private[collection] trait GenSetLike[A, +Repr]
    */
   def | (that: GenSet[A]): Repr = this union that
 
+  @bridge
+  def | (that: Set[A]): Repr = | (that: GenSet[A])
+
   /** Computes the difference of this set and another set.
    *
    *  @param that the set of elements to exclude.
@@ -92,6 +103,9 @@ private[collection] trait GenSetLike[A, +Repr]
    */
   def &~(that: GenSet[A]): Repr = this diff that
 
+  @bridge
+  def &~(that: Set[A]): Repr = &~(that: GenSet[A])
+
   /** Tests whether this set is a subset of another set.
    *
    *  @param that  the set to test.
@@ -100,6 +114,9 @@ private[collection] trait GenSetLike[A, +Repr]
    */
   def subsetOf(that: GenSet[A]): Boolean = this forall that
 
+  @bridge
+  def subsetOf(that: Set[A]): Boolean = subsetOf(that: GenSet[A])
+
   /** Compares this set with another object for equality.
    *
    *  '''Note:''' This operation contains an unchecked cast: if `that`