---

yaml
---
r: 151394
b: refs/heads/try2
c: 06fcb6b
h: refs/heads/master
v: v3

Author: alexcrichton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 6636215a44b27d1806a2ac646bde1d4ecaa801c4
+refs/heads/try2: 06fcb6b1c81f1f5190d431c169cd0c725fecf18e
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libcore/lib.rs

@@ -43,6 +43,7 @@ mod unit;
 pub mod any;
 pub mod bool;
 pub mod finally;
+pub mod option;
 pub mod raw;
 pub mod char;
 pub mod tuple;

branches/try2/src/libstd/option.rs renamed to branches/try2/src/libcore/option.rs

@@ -139,7 +139,6 @@
 //! ```
 
 use any::Any;
-use clone::Clone;
 use cmp::{Eq, TotalEq, TotalOrd};
 use default::Default;
 use iter::{Iterator, DoubleEndedIterator, FromIterator, ExactSize};
@@ -148,7 +147,7 @@ use mem;
 use slice;
 
 /// The `Option`
-#[deriving(Clone, Eq, Ord, TotalEq, TotalOrd, Show)]
+#[deriving(Clone, Eq, Ord, TotalEq, TotalOrd)]
 pub enum Option<T> {
     /// No value
     None,

branches/try2/src/libstd/fmt/mod.rs

@@ -1280,6 +1280,15 @@ impl<'a> Show for &'a any::Any {
     fn fmt(&self, f: &mut Formatter) -> Result { f.pad("&Any") }
 }
 
+impl<T: Show> Show for Option<T> {
+    fn fmt(&self, f: &mut Formatter) -> Result {
+        match *self {
+            Some(ref t) => write!(f.buf, "Some({})", *t),
+            None => write!(f.buf, "None"),
+        }
+    }
+}
+
 impl Show for () {
     fn fmt(&self, f: &mut Formatter) -> Result {
         f.pad("()")

branches/try2/src/libstd/lib.rs

@@ -146,6 +146,7 @@ pub use core::container;
 pub use core::default;
 pub use core::intrinsics;
 pub use core::mem;
+pub use core::option;
 pub use core::ptr;
 pub use core::raw;
 pub use core::tuple;
@@ -222,7 +223,6 @@ pub mod hash;
 
 /* Common data structures */
 
-pub mod option;
 pub mod result;
 pub mod cell;