---

yaml
---
r: 151384
b: refs/heads/try2
c: 7192452
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: d9708539afa16bf233332fee846cc9c6d7344517
+refs/heads/try2: 71924525458e508be139d76f48b34e64a5a9dca3
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -27,14 +27,13 @@
 use cast::transmute;
 use option::{None, Option, Some};
 use iter::{Iterator, range_step};
-use str::StrSlice;
 use unicode::{derived_property, property, general_category, decompose, conversions};
 
 #[cfg(test)] use str::Str;
 #[cfg(test)] use strbuf::StrBuf;
 #[cfg(test)] use slice::ImmutableVector;
 
-#[cfg(not(test))] use cmp::{Eq, Ord};
+#[cfg(not(test))] use cmp::{Eq, Ord, TotalEq, TotalOrd, Ordering};
 #[cfg(not(test))] use default::Default;
 
 // UTF-8 ranges and tags for encoding characters
@@ -659,12 +658,22 @@ impl Eq for char {
     fn eq(&self, other: &char) -> bool { (*self) == (*other) }
 }
 
+#[cfg(not(test))]
+impl TotalEq for char {}
+
 #[cfg(not(test))]
 impl Ord for char {
     #[inline]
     fn lt(&self, other: &char) -> bool { *self < *other }
 }
 
+#[cfg(not(test))]
+impl TotalOrd for char {
+    fn cmp(&self, other: &char) -> Ordering {
+        (*self as u32).cmp(&(*other as u32))
+    }
+}
+
 #[cfg(not(test))]
 impl Default for char {
     #[inline]

branches/try2/src/libcore/lib.rs

@@ -34,3 +34,7 @@ pub mod kinds;
 pub mod ops;
 pub mod ty;
 pub mod container;
+
+/* Core types and methods on primitives */
+
+pub mod char;

branches/try2/src/libstd/lib.rs

@@ -138,6 +138,7 @@ extern crate core;
 #[cfg(not(test))] pub use ty = core::ty;
 
 pub use core::cast;
+pub use core::char;
 pub use core::container;
 pub use core::intrinsics;
 pub use core::mem;
@@ -188,7 +189,6 @@ pub mod prelude;
 
 pub mod unit;
 pub mod bool;
-pub mod char;
 pub mod tuple;
 
 pub mod slice;