From 2fbd9f0cb28e14dabbf37ec9a398a82eacfb6dcb Mon Sep 17 00:00:00 2001
From: Tim Chevalier <chevalier@alum.wellesley.edu>
Date: Wed, 17 Jul 2013 15:32:02 -0700
Subject: [PATCH 1/2] testsuite: Add compile-fail test for #5883

---
 src/test/compile-fail/issue-5883.rs | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 src/test/compile-fail/issue-5883.rs

diff --git a/src/test/compile-fail/issue-5883.rs b/src/test/compile-fail/issue-5883.rs
new file mode 100644
index 0000000000000..a8b9000c6d9c9
--- /dev/null
+++ b/src/test/compile-fail/issue-5883.rs
@@ -0,0 +1,23 @@
+// 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.
+
+use std::io;
+
+struct Struct {
+    r: io::Reader //~ ERROR reference to trait `io::Reader` where a type is expected
+}
+
+fn new_struct(r: io::Reader) -> Struct { //~ ERROR reference to trait `io::Reader` where a type is expected
+    Struct { r: r }
+}
+
+trait Curve {}
+enum E {X(Curve)} //~ ERROR reference to trait `Curve` where a type is expected
+fn main() {}

From 0ce9135d71f6fd59da133e1cc685cf606582ae87 Mon Sep 17 00:00:00 2001
From: Tim Chevalier <chevalier@alum.wellesley.edu>
Date: Wed, 17 Jul 2013 16:58:43 -0700
Subject: [PATCH 2/2] testsuite: Test for #6153, closes #6153

---
 src/test/run-pass/issue-6153.rs | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 src/test/run-pass/issue-6153.rs

diff --git a/src/test/run-pass/issue-6153.rs b/src/test/run-pass/issue-6153.rs
new file mode 100644
index 0000000000000..a51b595f59f29
--- /dev/null
+++ b/src/test/run-pass/issue-6153.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 swap(f: &fn(~[int]) -> ~[int]) -> ~[int] {
+    let x = ~[1, 2, 3];
+    f(x)
+}
+
+fn main() {
+    let v = swap(|mut x| { x.push(4); x });
+    let w = do swap |mut x| { x.push(4); x };
+    assert_eq!(v, w);
+}