auto merge of #6368 : catamorphism/rust/issue-5315, r=catamorphism

2 files changed, 43 insertions, 0 deletions

diff --git a/src/test/run-pass/issue-5315.rs b/src/test/run-pass/issue-5315.rs
new file mode 100644
index 00000000000..326b3fb1246
--- /dev/null
+++ b/src/test/run-pass/issue-5315.rs
@@ -0,0 +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.
+
+// xfail-test
+struct A(bool);
+
+fn main() {
+    let f = A;
+    f(true);
+}
diff --git a/src/test/run-pass/issue-5353.rs b/src/test/run-pass/issue-5353.rs
new file mode 100644
index 00000000000..f933b616119
--- /dev/null
+++ b/src/test/run-pass/issue-5353.rs
@@ -0,0 +1,26 @@
+// 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.
+
+static INVALID_ENUM : u32 = 0;
+static INVALID_VALUE : u32 = 1;
+
+fn gl_err_str(err: u32) -> ~str
+{
+  match err
+  {
+    INVALID_ENUM => { ~"Invalid enum" },
+    INVALID_VALUE => { ~"Invalid value" },
+    _ => { ~"Unknown error" }
+  }
+}
+
+fn main() {}
+
+