Skip to content

Commit ff22e47

Browse files
committed
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.
2 parents 8a55cd9 + 53f3442 commit ff22e47

File tree

2 files changed

+35
-0
lines changed

2 files changed

+35
-0
lines changed

src/librustc/middle/typeck/collect.rs

+11
Original file line numberDiff line numberDiff line change
@@ -1040,12 +1040,23 @@ pub fn ty_of_foreign_fn_decl(ccx: &CrateCtxt,
10401040
ast_generics: &ast::Generics,
10411041
abis: AbiSet)
10421042
-> ty::ty_param_bounds_and_ty {
1043+
1044+
for i in decl.inputs.iter() {
1045+
match (*i).pat.node {
1046+
ast::PatIdent(_, _, _) => (),
1047+
ast::PatWild => (),
1048+
_ => ccx.tcx.sess.span_err((*i).pat.span,
1049+
"patterns aren't allowed in foreign function declarations")
1050+
}
1051+
}
1052+
10431053
let ty_generics = ty_generics(ccx, ast_generics, 0);
10441054
let rb = BindingRscope::new(def_id.node);
10451055
let input_tys = decl.inputs
10461056
.iter()
10471057
.map(|a| ty_of_arg(ccx, &rb, a, None))
10481058
.collect();
1059+
10491060
let output_ty = ast_ty_to_ty(ccx, &rb, decl.output);
10501061

10511062
let t_fn = ty::mk_bare_fn(

src/test/compile-fail/issue-10877.rs

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
struct Foo { x: int }
12+
extern {
13+
fn foo(1: ());
14+
//~^ ERROR: patterns aren't allowed in foreign function declarations
15+
fn bar((): int);
16+
//~^ ERROR: patterns aren't allowed in foreign function declarations
17+
fn baz(Foo { x }: int);
18+
//~^ ERROR: patterns aren't allowed in foreign function declarations
19+
fn qux((x,y): ());
20+
//~^ ERROR: patterns aren't allowed in foreign function declarations
21+
fn this_is_actually_ok(a: uint);
22+
fn and_so_is_this(_: uint);
23+
}
24+
fn main() {}

0 commit comments

Comments
 (0)