diff options
author | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2011-05-04 14:36:36 +0000 |
---|---|---|
committer | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2011-05-04 14:36:36 +0000 |
commit | e573f9b206f5822dce5f9ce86c5d680a5538cf90 (patch) | |
tree | 98cdf7ac57e5ecebca09dc0fd6ddc1754ea79d67 | |
parent | 28723395ed13eb41fad9127f1c5fbb45282a5397 (diff) | |
download | scala-e573f9b206f5822dce5f9ce86c5d680a5538cf90.tar.gz scala-e573f9b206f5822dce5f9ce86c5d680a5538cf90.tar.bz2 scala-e573f9b206f5822dce5f9ce86c5d680a5538cf90.zip |
Moved unapplySeq down to SeqFactory.
Review by extempore.
-rw-r--r-- | src/library/scala/collection/generic/GenSeqFactory.scala | 10 | ||||
-rw-r--r-- | src/library/scala/collection/generic/SeqFactory.scala | 11 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/library/scala/collection/generic/GenSeqFactory.scala b/src/library/scala/collection/generic/GenSeqFactory.scala index 6fcecc422b..58b76aed45 100644 --- a/src/library/scala/collection/generic/GenSeqFactory.scala +++ b/src/library/scala/collection/generic/GenSeqFactory.scala @@ -15,12 +15,4 @@ package generic * * @since 2.8 */ -abstract class GenSeqFactory[CC[X] <: GenSeq[X] with GenericTraversableTemplate[X, CC]] extends GenTraversableFactory[CC] { - - /** This method is called in a pattern match { case Seq(...) => }. - * - * @param x the selector value - * @return sequence wrapped in an option, if this is a Seq, otherwise none - */ - def unapplySeq[A](x: CC[A]): Some[CC[A]] = Some(x) -} +abstract class GenSeqFactory[CC[X] <: GenSeq[X] with GenericTraversableTemplate[X, CC]] extends GenTraversableFactory[CC] diff --git a/src/library/scala/collection/generic/SeqFactory.scala b/src/library/scala/collection/generic/SeqFactory.scala index 544d8f4d6f..c152a89528 100644 --- a/src/library/scala/collection/generic/SeqFactory.scala +++ b/src/library/scala/collection/generic/SeqFactory.scala @@ -18,5 +18,14 @@ import annotation.bridge * @since 2.8 */ abstract class SeqFactory[CC[X] <: Seq[X] with GenericTraversableTemplate[X, CC]] - extends GenSeqFactory[CC] with TraversableFactory[CC] +extends GenSeqFactory[CC] with TraversableFactory[CC] { + + /** This method is called in a pattern match { case Seq(...) => }. + * + * @param x the selector value + * @return sequence wrapped in an option, if this is a Seq, otherwise none + */ + def unapplySeq[A](x: CC[A]): Some[CC[A]] = Some(x) + +} |