diff options
| author | Burak Emir <emir@epfl.ch> | 2007-07-06 13:05:28 +0000 |
|---|---|---|
| committer | Burak Emir <emir@epfl.ch> | 2007-07-06 13:05:28 +0000 |
| commit | 7f4894c8badc38ebb33b695afd984ce21bd8487d (patch) | |
| tree | a34641b84da4ad568221f9aaeec869eeff105ce6 | |
| parent | 2754c449885cc26950302351b20c21ca17084759 (diff) | |
| download | scala-7f4894c8badc38ebb33b695afd984ce21bd8487d.tar.gz scala-7f4894c8badc38ebb33b695afd984ce21bd8487d.tar.bz2 scala-7f4894c8badc38ebb33b695afd984ce21bd8487d.zip | |
revert, predef doesn't know type "Some"
| -rw-r--r-- | src/library/scala/Predef.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala index e65b8d8272..61364836d2 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]): Some[Tuple2[A, B]] = Some(x) + def unapply[A, B](x: Tuple2[A, B]): Option[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]): Some[Tuple3[A, B, C]] = Some(x) + def unapply[A, B, C](x: Tuple3[A, B, C]): Option[Tuple3[A, B, C]] = Some(x) } class ArrowAssoc[A](x: A) { |