---

yaml
---
r: 49662
b: refs/heads/master
c: 83aa70d
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 91cb6687a8869fa14aef8d978fb13e330c711cd3
+refs/heads/master: 83aa70d7e3dba557d1812fe436082098cdf90c9a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
 refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea

trunk/src/libcore/cmp.rs

@@ -45,31 +45,62 @@ pub trait TotalOrd {
     fn cmp(&self, other: &Self) -> Ordering;
 }
 
-macro_rules! totalord_impl(
-    ($t:ty) => {
-        impl TotalOrd for $t {
-            #[inline(always)]
-            fn cmp(&self, other: &$t) -> Ordering {
-                if *self < *other { Less }
-                else if *self > *other { Greater }
-                else { Equal }
-            }
-        }
-    }
-)
+#[inline(always)]
+fn icmp<T: Ord>(a: &T, b: &T) -> Ordering {
+    if *a < *b { Less }
+    else if *a > *b { Greater }
+    else { Equal }
+}
+
+impl TotalOrd for u8 {
+    #[inline(always)]
+    fn cmp(&self, other: &u8) -> Ordering { icmp(self, other) }
+}
+
+impl TotalOrd for u16 {
+    #[inline(always)]
+    fn cmp(&self, other: &u16) -> Ordering { icmp(self, other) }
+}
+
+impl TotalOrd for u32 {
+    #[inline(always)]
+    fn cmp(&self, other: &u32) -> Ordering { icmp(self, other) }
+}
+
+impl TotalOrd for u64 {
+    #[inline(always)]
+    fn cmp(&self, other: &u64) -> Ordering { icmp(self, other) }
+}
+
+impl TotalOrd for i8 {
+    #[inline(always)]
+    fn cmp(&self, other: &i8) -> Ordering { icmp(self, other) }
+}
+
+impl TotalOrd for i16 {
+    #[inline(always)]
+    fn cmp(&self, other: &i16) -> Ordering { icmp(self, other) }
+}
 
-totalord_impl!(u8)
-totalord_impl!(u16)
-totalord_impl!(u32)
-totalord_impl!(u64)
+impl TotalOrd for i32 {
+    #[inline(always)]
+    fn cmp(&self, other: &i32) -> Ordering { icmp(self, other) }
+}
 
-totalord_impl!(i8)
-totalord_impl!(i16)
-totalord_impl!(i32)
-totalord_impl!(i64)
+impl TotalOrd for i64 {
+    #[inline(always)]
+    fn cmp(&self, other: &i64) -> Ordering { icmp(self, other) }
+}
 
-totalord_impl!(int)
-totalord_impl!(uint)
+impl TotalOrd for int {
+    #[inline(always)]
+    fn cmp(&self, other: &int) -> Ordering { icmp(self, other) }
+}
+
+impl TotalOrd for uint {
+    #[inline(always)]
+    fn cmp(&self, other: &uint) -> Ordering { icmp(self, other) }
+}
 
 /**
 * Trait for values that can be compared for a sort-order.

trunk/src/test/auxiliary/issue_3907_1.rs

@@ -0,0 +1,3 @@
+pub trait Foo {
+        fn bar();
+}

trunk/src/test/compile-fail/issue-3820.rs

@@ -8,27 +8,19 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-test
 struct Thing {
     x: int
 }
 
-impl Mul<int, Thing>*/ for Thing/* { //~ ERROR Look ma, no Mul!
-    fn mul(c: &int) -> Thing {
+impl Thing {
+    fn mul(&self, c: &int) -> Thing {
         Thing {x: self.x * *c}
     }
 }
 
 fn main() {
     let u = Thing {x: 2};
-    let _v = u.mul(&3); // Works
-    let w = u * 3; // Works!!
+    let _v = u.mul(&3); // This is ok
+    let w = u * 3; //~ ERROR binary operation * cannot be applied to type `Thing`
     io::println(fmt!("%i", w.x));
-
-    /*
-    // This doesn't work though.
-    let u2 = u as @Mul<int, Thing>;
-    let w2 = u2.mul(&4);
-    io::println(fmt!("%i", w2.x));
-    */
 }

trunk/src/test/compile-fail/issue-3973.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // xfail-test
-
 struct Point {
     x: float,
     y: float,

trunk/src/test/compile-fail/issue-3991.rs

@@ -0,0 +1,22 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// xfail-test
+struct HasNested {
+    mut nest: ~[~[int]],
+}
+    
+impl HasNested {
+    fn method_push_local(&self) {
+        self.nest[0].push(0);
+    }
+}
+    
+fn main() {}

trunk/src/test/compile-fail/issue-4265.rs

@@ -0,0 +1,24 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+struct Foo {
+      baz: uint
+}
+    
+impl Foo {
+    fn bar() {
+        Foo { baz: 0 }.bar();
+    }
+    
+    fn bar() { //~ ERROR duplicate definition of value bar
+    }
+}
+
+fn main() {}

trunk/src/test/compile-fail/issue-4542.rs

@@ -0,0 +1,19 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// xfail-test
+
+fn main() {
+    for os::args().each |arg| {
+        match copy *arg {
+            s => { }
+        }
+    }
+}

trunk/src/test/compile-fail/issue-5035.rs

@@ -0,0 +1,15 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// xfail-test
+trait I {}
+type K = I;
+impl K for int {}
+fn main() {}

trunk/src/test/compile-fail/issue-5062.rs

@@ -0,0 +1,12 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// xfail-test
+fn main() { fmt!("%?", None); } //~ ERROR can't resolve type variable

trunk/src/test/compile-fail/issue-5099.rs

@@ -0,0 +1,14 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+
+trait B < A > { fn a() -> A { self.a} } //~ ERROR unresolved name
+
+fn main() {}

trunk/src/test/run-pass/assert-eq-macro-success.rs

@@ -1,7 +1,17 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 #[deriving(Eq)]
 struct Point { x : int }
 
-fn main() {
+pub fn main() {
     assert_eq!(14,14);
     assert_eq!(~"abc",~"abc");
     assert_eq!(~Point{x:34},~Point{x:34});

trunk/src/test/run-pass/const-cast-ptr-int.rs

@@ -10,6 +10,6 @@
 
 static a: *u8 = 0 as *u8;
 
-fn main() {
+pub fn main() {
     fail_unless!(a == ptr::null());
 }

trunk/src/test/run-pass/const-cast.rs

@@ -15,7 +15,7 @@ static y: *libc::c_void = x as *libc::c_void;
 static a: &'static int = &10;
 static b: *int = a as *int;
 
-fn main() {
+pub fn main() {
     fail_unless!(x as *libc::c_void == y);
     fail_unless!(a as *int == b);
 }

trunk/src/test/run-pass/const-cross-crate-extern.rs

@@ -15,6 +15,6 @@ extern mod cci_const;
 use cci_const::bar;
 static foo: *u8 = bar;
 
-fn main() {
+pub fn main() {
     fail_unless!(foo == cci_const::bar);
 }

trunk/src/test/run-pass/const-enum-cast.rs

@@ -11,7 +11,7 @@
 enum A { A1, A2 }
 enum B { B1=0, B2=2 }
 
-fn main () {
+pub fn main () {
     static c1: int = A2 as int;
     static c2: int = B2 as int;
     static c3: float = A2 as float;

trunk/src/test/run-pass/const-enum-structlike.rs

@@ -15,7 +15,7 @@ enum E {
 
 static C: E = S1 { u: 23 };
 
-fn main() {
+pub fn main() {
     match C {
         S0 { _ } => fail!(),
         S1 { u } => fail_unless!(u == 23)

trunk/src/test/run-pass/const-expr-in-fixed-length-vec.rs

@@ -11,7 +11,7 @@
 // Check that constant expressions can be used for declaring the 
 // type of a fixed length vector.
 
-fn main() {
+pub fn main() {
 
     static FOO: int = 2;
     let _v: [int, ..FOO*3];

trunk/src/test/run-pass/const-expr-in-vec-repeat.rs

@@ -10,7 +10,7 @@
 
 // Check that constant expressions can be used in vec repeat syntax. 
 
-fn main() {
+pub fn main() {
 
     static FOO: int = 2;
     let _v = [0, ..FOO*3*2/2];

trunk/src/test/run-pass/const-str-ptr.rs

@@ -12,7 +12,7 @@ static a: [u8, ..3] = ['h' as u8, 'i' as u8, 0 as u8];
 static c: &'static [u8, ..3] = &a;
 static b: *u8 = c as *u8;
 
-fn main() {
+pub fn main() {
     let foo = &a as *u8;
     fail_unless!(unsafe { str::raw::from_bytes(a) } == ~"hi\x00");
     fail_unless!(unsafe { str::raw::from_buf(foo) } == ~"hi");

trunk/src/test/run-pass/const-vec-syntax.rs

@@ -1,6 +1,16 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 fn f(_: &const [int]) {}
 
-fn main() {
+pub fn main() {
     let v = [ 1, 2, 3 ];
     f(v);
 }

trunk/src/test/run-pass/deriving-clone-enum.rs

@@ -1,9 +1,19 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 #[deriving(Clone)]
 enum E {
     A,
     B(()),
     C
 }
 
-fn main() {}
+pub fn main() {}
 

trunk/src/test/run-pass/deriving-clone-generic-struct.rs

@@ -1,9 +1,19 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 #[deriving(Clone)]
 struct S<T> {
     foo: (),
     bar: (),
     baz: T,
 }
 
-fn main() {}
+pub fn main() {}