diff options
-rw-r--r-- | src/library/scala/collection/generic/GenSeqFactory.scala | 10 | ||||
-rw-r--r-- | src/library/scala/collection/generic/SeqFactory.scala | 2 | ||||
-rw-r--r-- | test/files/run/t4709.scala | 10 |
3 files changed, 19 insertions, 3 deletions
diff --git a/src/library/scala/collection/generic/GenSeqFactory.scala b/src/library/scala/collection/generic/GenSeqFactory.scala index 58b76aed45..ee6ecae3c2 100644 --- a/src/library/scala/collection/generic/GenSeqFactory.scala +++ b/src/library/scala/collection/generic/GenSeqFactory.scala @@ -11,8 +11,16 @@ package scala.collection package generic +import annotation.bridge + /** A template for companion objects of Seq and subclasses thereof. * * @since 2.8 */ -abstract class GenSeqFactory[CC[X] <: GenSeq[X] with GenericTraversableTemplate[X, CC]] extends GenTraversableFactory[CC] +abstract class GenSeqFactory[CC[X] <: GenSeq[X] with GenericTraversableTemplate[X, CC]] +extends GenTraversableFactory[CC] { + + @bridge + def unapplySeq[A](x: GenSeq[A]): Some[GenSeq[A]] = Some(x) + +} diff --git a/src/library/scala/collection/generic/SeqFactory.scala b/src/library/scala/collection/generic/SeqFactory.scala index c152a89528..7bd92173ff 100644 --- a/src/library/scala/collection/generic/SeqFactory.scala +++ b/src/library/scala/collection/generic/SeqFactory.scala @@ -11,8 +11,6 @@ package scala.collection package generic -import annotation.bridge - /** A template for companion objects of Seq and subclasses thereof. * * @since 2.8 diff --git a/test/files/run/t4709.scala b/test/files/run/t4709.scala new file mode 100644 index 0000000000..c61a440397 --- /dev/null +++ b/test/files/run/t4709.scala @@ -0,0 +1,10 @@ + + +import collection.GenSeq + + +object Test { + def main(args: Array[String]) { + val Seq(1, 2) = Stream(1, 2) + } +} |