auto merge of #12018 : alexcrichton/rust/triage, r=sfackler

Mostly just test suite modifications.

9 files changed, 88 insertions, 5 deletions

diff --git a/src/test/auxiliary/issue-5521.rs b/src/test/auxiliary/issue-5521.rs
new file mode 100644
index 00000000000..951e94e47c5
--- /dev/null
+++ b/src/test/auxiliary/issue-5521.rs
@@ -0,0 +1,15 @@
+// Copyright 2014 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.
+
+#[feature(managed_boxes)];
+
+use std::hashmap::HashMap;
+
+pub type map = @HashMap<uint, uint>;
diff --git a/src/test/compile-fail/struct-no-fields-2.rs b/src/test/compile-fail/struct-no-fields-2.rs
index b6a40a0e8e9..63e38e35447 100644
--- a/src/test/compile-fail/struct-no-fields-2.rs
+++ b/src/test/compile-fail/struct-no-fields-2.rs
@@ -8,11 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: Unit-like struct construction is written with no trailing `{ }`
 struct Foo;
 
 fn f2() {
     let _end_stmt     = Foo { };
+    //~^ ERROR: Unit-like struct construction is written with no trailing `{ }`
 }
 
 fn main() {}
diff --git a/src/test/compile-fail/struct-no-fields-3.rs b/src/test/compile-fail/struct-no-fields-3.rs
index b6845ce7292..33077d4f1b3 100644
--- a/src/test/compile-fail/struct-no-fields-3.rs
+++ b/src/test/compile-fail/struct-no-fields-3.rs
@@ -8,11 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: Unit-like struct construction is written with no trailing `{ }`
 struct Foo;
 
 fn g3() {
     let _mid_tuple    = (Foo { }, 2);
+    //~^ ERROR: Unit-like struct construction is written with no trailing `{ }`
 }
 
 fn main() {}
diff --git a/src/test/compile-fail/struct-no-fields-4.rs b/src/test/compile-fail/struct-no-fields-4.rs
index 0bd3c8d5855..6b73cb769ee 100644
--- a/src/test/compile-fail/struct-no-fields-4.rs
+++ b/src/test/compile-fail/struct-no-fields-4.rs
@@ -8,11 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: Unit-like struct construction is written with no trailing `{ }`
 struct Foo;
 
 fn h4() {
     let _end_of_tuple = (3, Foo { });
+    //~^ ERROR: Unit-like struct construction is written with no trailing `{ }`
 }
 
 fn main() {}
diff --git a/src/test/compile-fail/struct-no-fields-5.rs b/src/test/compile-fail/struct-no-fields-5.rs
index 1af72ff6d78..81c050e61cb 100644
--- a/src/test/compile-fail/struct-no-fields-5.rs
+++ b/src/test/compile-fail/struct-no-fields-5.rs
@@ -8,11 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: Unit-like struct construction is written with no trailing `{ }`
 struct Foo;
 
 fn i5() {
     let _end_of_block = { Foo { } };
+    //~^ ERROR: Unit-like struct construction is written with no trailing `{ }`
 }
 
 fn main() {}
diff --git a/src/test/compile-fail/struct-no-fields.rs b/src/test/compile-fail/struct-no-fields.rs
index 5053b842e65..6142ec0653c 100644
--- a/src/test/compile-fail/struct-no-fields.rs
+++ b/src/test/compile-fail/struct-no-fields.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: Unit-like struct definition should be written as `struct Foo;`
 struct Foo {}
+//~^ ERROR: Unit-like struct definition should be written as `struct Foo;`
 
 fn main() {}
diff --git a/src/test/run-pass/issue-10714.rs b/src/test/run-pass/issue-10714.rs
new file mode 100644
index 00000000000..d369546317e
--- /dev/null
+++ b/src/test/run-pass/issue-10714.rs
@@ -0,0 +1,14 @@
+// Copyright 2014 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.
+
+enum v {}
+pub fn main() {
+    let y: v = unsafe { ::std::unstable::intrinsics::uninit() };
+}
diff --git a/src/test/run-pass/issue-5521.rs b/src/test/run-pass/issue-5521.rs
new file mode 100644
index 00000000000..d3ba893b841
--- /dev/null
+++ b/src/test/run-pass/issue-5521.rs
@@ -0,0 +1,26 @@
+// Copyright 2014 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.
+
+// aux-build:issue-5521.rs
+// xfail-fast
+
+#[feature(managed_boxes)];
+
+extern mod foo = "issue-5521";
+
+fn foo(a: foo::map) {
+    if false {
+        fail!();
+    } else {
+        let _b = a.get(&2);
+    }
+}
+
+fn main() {}
diff --git a/src/test/run-pass/issue-9396.rs b/src/test/run-pass/issue-9396.rs
new file mode 100644
index 00000000000..5ddcec3676d
--- /dev/null
+++ b/src/test/run-pass/issue-9396.rs
@@ -0,0 +1,28 @@
+// Copyright 2014 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.
+
+use std::comm;
+use std::io::timer::Timer;
+
+pub fn main() {
+    let (port, chan) = Chan::new();
+    spawn(proc (){
+        let mut timer = Timer::new().unwrap();
+        timer.sleep(10);
+        chan.send(());
+    });
+    loop {
+        match port.try_recv() {
+            comm::Data(()) => break,
+            comm::Empty => {}
+            comm::Disconnected => unreachable!()
+        }
+    }
+}