---

yaml
---
r: 113856
b: refs/heads/master
c: e7eed5f
h: refs/heads/master
v: v3

Author: alexcrichton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: dfd967f239a079cf90f45bfc3d827547e6fe9008
+refs/heads/master: e7eed5f670e8b283e7afcba5c79b3b208167a647
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: ec0258a381b88b5574e3f8ce72ae553ac3a574b7
 refs/heads/try: 7c6c492fb2af9a85f21ff952942df3523b22fd17

trunk/src/libcore/lib.rs

@@ -38,6 +38,7 @@ pub mod container;
 
 /* Core types and methods on primitives */
 
+mod unit;
 pub mod any;
 pub mod finally;
 pub mod raw;

trunk/src/libstd/unit.rs renamed to trunk/src/libcore/unit.rs

@@ -14,7 +14,6 @@
 use default::Default;
 #[cfg(not(test))]
 use cmp::{Eq, Equal, Ord, Ordering, TotalEq, TotalOrd};
-use fmt;
 
 #[cfg(not(test))]
 impl Eq for () {
@@ -44,9 +43,3 @@ impl Default for () {
     #[inline]
     fn default() -> () { () }
 }
-
-impl fmt::Show for () {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.pad("()")
-    }
-}

trunk/src/libstd/fmt/mod.rs

@@ -1250,6 +1250,12 @@ impl<'a> Show for &'a any::Any {
     fn fmt(&self, f: &mut Formatter) -> Result { f.pad("&Any") }
 }
 
+impl Show for () {
+    fn fmt(&self, f: &mut Formatter) -> Result {
+        f.pad("()")
+    }
+}
+
 impl Show for TypeId {
     fn fmt(&self, f: &mut Formatter) -> Result {
         write!(f.buf, "TypeId \\{ {} \\}", self.hash())

trunk/src/libstd/lib.rs

@@ -190,7 +190,6 @@ pub mod prelude;
 #[path = "num/f32.rs"]   pub mod f32;
 #[path = "num/f64.rs"]   pub mod f64;
 
-pub mod unit;
 pub mod bool;
 pub mod tuple;