about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-03-05 12:51:48 -0800
committerbors <bors@rust-lang.org>2014-03-05 12:51:48 -0800
commitff22e47c1915d6cdc545deb341c83d877a8825e6 (patch)
tree62ff572c6f41059874e49f5aa4b26b952bd0e537 /src
parent8a55cd988f272ec70fc7d5adf6e61ed8ee6a8e78 (diff)
parent53f3442ef7ee2852e6e59158f47ae7dbefb2f175 (diff)
downloadrust-ff22e47c1915d6cdc545deb341c83d877a8825e6.tar.gz
rust-ff22e47c1915d6cdc545deb341c83d877a8825e6.zip
auto merge of #12715 : dmski/rust/no-extern-fn-pat, r=alexcrichton
Fixes #10877

There was another PR which attempted to fix this in the parser (#11804) and which was closed due to inactivity.
This PR modifies typeck instead (as suggested in #11804), which indeed seems to be simpler than modifying the parser and allows for a better error message.
Diffstat (limited to 'src')
-rw-r--r--src/librustc/middle/typeck/collect.rs11
-rw-r--r--src/test/compile-fail/issue-10877.rs24
2 files changed, 35 insertions, 0 deletions
diff --git a/src/librustc/middle/typeck/collect.rs b/src/librustc/middle/typeck/collect.rs
index f7733335c91..e40ff6be667 100644
--- a/src/librustc/middle/typeck/collect.rs
+++ b/src/librustc/middle/typeck/collect.rs
@@ -1040,12 +1040,23 @@ pub fn ty_of_foreign_fn_decl(ccx: &CrateCtxt,
                              ast_generics: &ast::Generics,
                              abis: AbiSet)
                           -> ty::ty_param_bounds_and_ty {
+
+    for i in decl.inputs.iter() {
+        match (*i).pat.node {
+            ast::PatIdent(_, _, _) => (),
+            ast::PatWild => (),
+            _ => ccx.tcx.sess.span_err((*i).pat.span,
+                    "patterns aren't allowed in foreign function declarations")
+        }
+    }
+
     let ty_generics = ty_generics(ccx, ast_generics, 0);
     let rb = BindingRscope::new(def_id.node);
     let input_tys = decl.inputs
                         .iter()
                         .map(|a| ty_of_arg(ccx, &rb, a, None))
                         .collect();
+
     let output_ty = ast_ty_to_ty(ccx, &rb, decl.output);
 
     let t_fn = ty::mk_bare_fn(
diff --git a/src/test/compile-fail/issue-10877.rs b/src/test/compile-fail/issue-10877.rs
new file mode 100644
index 00000000000..fd113908165
--- /dev/null
+++ b/src/test/compile-fail/issue-10877.rs
@@ -0,0 +1,24 @@
+// 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.
+
+struct Foo { x: int }
+extern {
+    fn foo(1: ());
+    //~^ ERROR: patterns aren't allowed in foreign function declarations
+    fn bar((): int);
+    //~^ ERROR: patterns aren't allowed in foreign function declarations
+    fn baz(Foo { x }: int);
+    //~^ ERROR: patterns aren't allowed in foreign function declarations
+    fn qux((x,y): ());
+    //~^ ERROR: patterns aren't allowed in foreign function declarations
+    fn this_is_actually_ok(a: uint);
+    fn and_so_is_this(_: uint);
+}
+fn main() {}
\ No newline at end of file