summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBurak Emir <emir@epfl.ch>2007-07-06 12:27:27 +0000
committerBurak Emir <emir@epfl.ch>2007-07-06 12:27:27 +0000
commit2754c449885cc26950302351b20c21ca17084759 (patch)
tree5f96930aaee6692a05409ca16fdca3535406aeb5
parent16e1b57be1b05c460bbce0de51e607ae6b1b9027 (diff)
downloadscala-2754c449885cc26950302351b20c21ca17084759.tar.gz
scala-2754c449885cc26950302351b20c21ca17084759.tar.bz2
scala-2754c449885cc26950302351b20c21ca17084759.zip
Pair,Triple # unapply:Option->Some
-rw-r--r--src/library/scala/Predef.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala
index 61364836d2..e65b8d8272 100644
--- a/src/library/scala/Predef.scala
+++ b/src/library/scala/Predef.scala
@@ -105,13 +105,13 @@ object Predef {
type Pair[+A, +B] = Tuple2[A, B]
object Pair {
def apply[A, B](x: A, y: B) = Tuple2(x, y)
- def unapply[A, B](x: Tuple2[A, B]): Option[Tuple2[A, B]] = Some(x)
+ def unapply[A, B](x: Tuple2[A, B]): Some[Tuple2[A, B]] = Some(x)
}
type Triple[+A, +B, +C] = Tuple3[A, B, C]
object Triple {
def apply[A, B, C](x: A, y: B, z: C) = Tuple3(x, y, z)
- def unapply[A, B, C](x: Tuple3[A, B, C]): Option[Tuple3[A, B, C]] = Some(x)
+ def unapply[A, B, C](x: Tuple3[A, B, C]): Some[Tuple3[A, B, C]] = Some(x)
}
class ArrowAssoc[A](x: A) {