auto merge of #14598 : alexcrichton/rust/triage, r=huonw

Closes #10764

2 files changed, 26 insertions, 0 deletions

diff --git a/src/test/compile-fail/issue-10764.rs b/src/test/compile-fail/issue-10764.rs
new file mode 100644
index 00000000000..dfb38953ab3
--- /dev/null
+++ b/src/test/compile-fail/issue-10764.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.
+
+fn f(_: extern "Rust" fn()) {}
+extern fn bar() {}
+
+fn main() { f(bar) }
+//~^ ERROR: expected `fn()` but found `extern "C" fn()`
diff --git a/src/test/run-pass/issue-10764.rs b/src/test/run-pass/issue-10764.rs
new file mode 100644
index 00000000000..f824b5fd4dc
--- /dev/null
+++ b/src/test/run-pass/issue-10764.rs
@@ -0,0 +1,11 @@
+// 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.
+
+extern "Rust" fn main() {}