---

yaml
---
r: 57201
b: refs/heads/try
c: ad0b337
h: refs/heads/master
i:
  57199: 6400abd
v: v3

Author: brendanzab

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: c081ffbd1e845687202a975ea2e698b623e5722f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 79a2b2eafc3c766cecec8a5f76317693bae9ed17
-refs/heads/try: 6d589f88f79a987de61fce00f0364b4199f50c22
+refs/heads/try: ad0b337036f2f9076852d5d6701ec302e3cce101
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libcore/char.rs

@@ -10,7 +10,6 @@
 
 //! Utilities for manipulating the char type
 
-use cmp::Ord;
 use option::{None, Option, Some};
 use str;
 use u32;
@@ -244,26 +243,26 @@ pub fn len_utf8_bytes(c: char) -> uint {
     else { fail!(~"invalid character!") }
 }
 
+/**
+ * Compare two chars
+ *
+ * # Return value
+ *
+ * -1 if a < b, 0 if a == b, +1 if a > b
+ */
+#[inline(always)]
+pub fn cmp(a: char, b: char) -> int {
+    return  if b > a { -1 }
+    else if b < a { 1 }
+    else { 0 }
+}
+
 #[cfg(notest)]
 impl Eq for char {
-    #[inline(always)]
     fn eq(&self, other: &char) -> bool { (*self) == (*other) }
-    #[inline(always)]
     fn ne(&self, other: &char) -> bool { (*self) != (*other) }
 }
 
-#[cfg(notest)]
-impl Ord for char {
-    #[inline(always)]
-    fn lt(&self, other: &char) -> bool { *self < *other }
-    #[inline(always)]
-    fn le(&self, other: &char) -> bool { *self <= *other }
-    #[inline(always)]
-    fn gt(&self, other: &char) -> bool { *self > *other }
-    #[inline(always)]
-    fn ge(&self, other: &char) -> bool { *self >= *other }
-}
-
 #[test]
 fn test_is_lowercase() {
     assert!(is_lowercase('a'));

branches/try/src/libcore/cmp.rs

@@ -64,8 +64,6 @@ totaleq_impl!(i64)
 totaleq_impl!(int)
 totaleq_impl!(uint)
 
-totaleq_impl!(char)
-
 #[deriving(Clone, Eq)]
 pub enum Ordering { Less = -1, Equal = 0, Greater = 1 }
 
@@ -118,8 +116,6 @@ totalord_impl!(i64)
 totalord_impl!(int)
 totalord_impl!(uint)
 
-totalord_impl!(char)
-
 pub fn cmp2<A:TotalOrd,B:TotalOrd>(
     a1: &A, b1: &B,
     a2: &A, b2: &B) -> Ordering

branches/try/src/libcore/core.rc

@@ -77,9 +77,7 @@ pub use kinds::{Const, Copy, Owned, Durable};
 pub use ops::{Drop};
 #[cfg(stage0)]
 pub use ops::{Add, Sub, Mul, Div, Modulo, Neg, Not};
-#[cfg(stage1)]
-#[cfg(stage2)]
-#[cfg(stage3)]
+#[cfg(not(stage0))]
 pub use ops::{Add, Sub, Mul, Quot, Rem, Neg, Not};
 pub use ops::{BitAnd, BitOr, BitXor};
 pub use ops::{Shl, Shr, Index};
@@ -105,7 +103,9 @@ pub use iter::{BaseIter, ExtendedIter, EqIter, CopyableIter};
 pub use iter::{CopyableOrderedIter, CopyableNonstrictIter, Times};
 pub use iter::{ExtendedMutableIter};
 
-pub use num::{Num, Signed, Unsigned, Natural, NumCast};
+pub use num::{Num, NumCast};
+pub use num::{Signed, Unsigned, Integer};
+pub use num::{Round, Fractional, Real, RealExt};
 pub use ptr::Ptr;
 pub use to_str::ToStr;
 pub use clone::Clone;