From 567a03d19b81aa6cb0e46df5f379db1dc268c983 Mon Sep 17 00:00:00 2001 From: Tim Chevalier Date: Tue, 22 Oct 2013 21:04:15 -0700 Subject: [PATCH] testsuite: Test cases, all except issue-5216 xfailed --- src/test/compile-fail/issue-5216.rs | 20 ++++++++++ src/test/compile-fail/issue-5500-1.rs | 22 +++++++++++ src/test/compile-fail/issue-5500.rs | 13 +++++++ src/test/run-pass/issue-6334.rs | 56 +++++++++++++++++++++++++++ 4 files changed, 111 insertions(+) create mode 100644 src/test/compile-fail/issue-5216.rs create mode 100644 src/test/compile-fail/issue-5500-1.rs create mode 100644 src/test/compile-fail/issue-5500.rs create mode 100644 src/test/run-pass/issue-6334.rs diff --git a/src/test/compile-fail/issue-5216.rs b/src/test/compile-fail/issue-5216.rs new file mode 100644 index 0000000000000..9f88ba72f059a --- /dev/null +++ b/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 or the MIT license +// , 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() {} diff --git a/src/test/compile-fail/issue-5500-1.rs b/src/test/compile-fail/issue-5500-1.rs new file mode 100644 index 0000000000000..f709aadf4ac8e --- /dev/null +++ b/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 or the MIT license +// , 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!() +} diff --git a/src/test/compile-fail/issue-5500.rs b/src/test/compile-fail/issue-5500.rs new file mode 100644 index 0000000000000..7bf20037f5abd --- /dev/null +++ b/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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// xfail-test + +fn main() { &fail!() } //~ ERROR bad diff --git a/src/test/run-pass/issue-6334.rs b/src/test/run-pass/issue-6334.rs new file mode 100644 index 0000000000000..740a2212726d6 --- /dev/null +++ b/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 or the MIT license +// , 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(&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(&self, t: &T) -> uint { + (t.a() * 100) + t.b() + } +} + +fn use_c(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); +}