---

yaml
---
r: 152205
b: refs/heads/try2
c: bba701c
h: refs/heads/master
i:
  152203: 082beea
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: c605c2b57b412402e6b491e91852fd9dbadeb551
+refs/heads/try2: bba701c59d84eac4e20d0796ec06db8d1cdd39cf
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/liballoc/owned.rs

@@ -12,7 +12,7 @@
 
 use core::any::{Any, AnyRefExt};
 use core::clone::Clone;
-use core::cmp::{PartialEq, PartialOrd, TotalEq, TotalOrd, Ordering};
+use core::cmp::{PartialEq, PartialOrd, Eq, Ord, Ordering};
 use core::default::Default;
 use core::fmt;
 use core::intrinsics;
@@ -67,11 +67,11 @@ impl<T:PartialOrd> PartialOrd for Box<T> {
     #[inline]
     fn gt(&self, other: &Box<T>) -> bool { *(*self) > *(*other) }
 }
-impl<T: TotalOrd> TotalOrd for Box<T> {
+impl<T: Ord> Ord for Box<T> {
     #[inline]
     fn cmp(&self, other: &Box<T>) -> Ordering { (**self).cmp(*other) }
 }
-impl<T: TotalEq> TotalEq for Box<T> {}
+impl<T: Eq> Eq for Box<T> {}
 
 /// Extension methods for an owning `Any` trait object
 pub trait AnyOwnExt {

branches/try2/src/liballoc/rc.rs

@@ -26,7 +26,7 @@ pointers, and then storing the parent pointers as `Weak` pointers.
 use core::mem::transmute;
 use core::cell::Cell;
 use core::clone::Clone;
-use core::cmp::{PartialEq, PartialOrd, TotalEq, TotalOrd, Ordering};
+use core::cmp::{PartialEq, PartialOrd, Eq, Ord, Ordering};
 use core::kinds::marker;
 use core::ops::{Deref, Drop};
 use core::option::{Option, Some, None};
@@ -157,7 +157,7 @@ impl<T: PartialEq> PartialEq for Rc<T> {
     fn ne(&self, other: &Rc<T>) -> bool { **self != **other }
 }
 
-impl<T: TotalEq> TotalEq for Rc<T> {}
+impl<T: Eq> Eq for Rc<T> {}
 
 impl<T: PartialOrd> PartialOrd for Rc<T> {
     #[inline(always)]
@@ -173,7 +173,7 @@ impl<T: PartialOrd> PartialOrd for Rc<T> {
     fn ge(&self, other: &Rc<T>) -> bool { **self >= **other }
 }
 
-impl<T: TotalOrd> TotalOrd for Rc<T> {
+impl<T: Ord> Ord for Rc<T> {
     #[inline]
     fn cmp(&self, other: &Rc<T>) -> Ordering { (**self).cmp(&**other) }
 }