---

yaml
---
r: 142823
b: refs/heads/try2
c: 948334f
h: refs/heads/master
i:
  142821: 60e9407
  142819: c161c1e
  142815: 7bcb73b
v: v3

Author: poiru

[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: 403cdd84a4e9f01848445255078cce6bcebae8e3
+refs/heads/try2: 948334f33398f0ba073107585b8dfaa0dc9feaa9
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/cmp.rs

@@ -157,20 +157,19 @@ pub fn lexical_ordering(o1: Ordering, o2: Ordering) -> Ordering {
 /**
 * Trait for values that can be compared for a sort-order.
 *
-* Ord only requires implementation of the `lt` method,
-* with the others generated from default implementations.
-*
-* However it remains possible to implement the others separately,
-* for compatibility with floating-point NaN semantics
+* Eventually this may be simplified to only require
+* an `le` method, with the others generated from
+* default implementations. However it should remain
+* possible to implement the others separately, for
+* compatibility with floating-point NaN semantics
 * (cf. IEEE 754-2008 section 5.11).
 */
-#[allow(default_methods)] // NOTE: Remove when allowed in stage0
 #[lang="ord"]
 pub trait Ord {
     fn lt(&self, other: &Self) -> bool;
-    fn le(&self, other: &Self) -> bool { !other.lt(self) }
-    fn gt(&self, other: &Self) -> bool {  other.lt(self) }
-    fn ge(&self, other: &Self) -> bool { !self.lt(other) }
+    fn le(&self, other: &Self) -> bool;
+    fn ge(&self, other: &Self) -> bool;
+    fn gt(&self, other: &Self) -> bool;
 }
 
 /// The equivalence relation. Two values may be equivalent even if they are

branches/try2/src/libsyntax/ext/expand.rs

@@ -643,6 +643,18 @@ pub fn core_macros() -> @str {
             $(if $pred $body)else+
         );
     )
+
+    macro_rules! print(
+        ($( $arg:expr),+) => ( {
+            print(fmt!($($arg),+));
+        } )
+    )
+
+    macro_rules! println(
+        ($( $arg:expr),+) => ( {
+            println(fmt!($($arg),+));
+        } )
+    )
 }";
 }
 

branches/try2/src/test/compile-fail/issue-3344.rs

@@ -9,7 +9,8 @@
 // except according to those terms.
 
 struct thing(uint);
-impl Ord for thing { //~ ERROR missing method `lt`
+impl Ord for thing { //~ ERROR missing method `gt`
+    fn lt(&self, other: &thing) -> bool { **self < **other }
     fn le(&self, other: &thing) -> bool { **self < **other }
     fn ge(&self, other: &thing) -> bool { **self < **other }
 }