auto merge of #10027 : catamorphism/rust/testcases-2013-10-22, r=catamorphism

src/test/compile-fail/issue-5216.rs

@@ -0,0 +1,20 @@
+// 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() { }
+struct S(&fn()); //~ ERROR Illegal anonymous lifetime
+pub static C: S = S(f); //~ ERROR Illegal anonymous lifetime
+
+
+fn g() { }
+type T = &fn(); //~ ERROR Illegal anonymous lifetime
+pub static D: T = g; //~ ERROR Illegal anonymous lifetime
+
+fn main() {}

src/test/compile-fail/issue-5500-1.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 TrieMapIterator<'self> {
+    priv node: &'self uint
+}
+
+fn main() {
+    let a = 5;
+    let _iter = TrieMapIterator{node: &a};  //~ ERROR bad
+    _iter.node = &
+    fail!()
+}

src/test/compile-fail/issue-5500.rs

@@ -0,0 +1,13 @@
+// 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() { &fail!() } //~ ERROR bad

src/test/run-pass/issue-6334.rs

@@ -0,0 +1,56 @@
+// 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
+
+// Tests that everything still compiles and runs fine even when
+// we reorder the bounds.
+
+trait A {
+    fn a(&self) -> uint;
+}
+
+trait B {
+    fn b(&self) -> uint;
+}
+
+trait C {
+    fn combine<T:A+B>(&self, t: &T) -> uint;
+}
+
+struct Foo;
+
+impl A for Foo {
+    fn a(&self) -> uint { 1 }
+}
+
+impl B for Foo {
+    fn b(&self) -> uint { 2 }
+}
+
+struct Bar;
+
+impl C for Bar {
+    // Note below: bounds in impl decl are in reverse order.
+    fn combine<T:B+A>(&self, t: &T) -> uint {
+        (t.a() * 100) + t.b()
+    }
+}
+
+fn use_c<S:C, T:B+A>(s: &S, t: &T) -> uint {
+    s.combine(t)
+}
+
+fn main() {
+    let foo = Foo;
+    let bar = Bar;
+    let r = use_c(&bar, &foo);
+    assert_eq!(r, 102);
+}