---

yaml
---
r: 151389
b: refs/heads/try2
c: e7eed5f
h: refs/heads/master
i:
  151387: f6af7c6
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: dfd967f239a079cf90f45bfc3d827547e6fe9008
+refs/heads/try2: e7eed5f670e8b283e7afcba5c79b3b208167a647
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/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;

branches/try2/src/libstd/unit.rs renamed to branches/try2/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("()")
-    }
-}

branches/try2/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())

branches/try2/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;