Skip to content

Commit

Permalink
auto merge of rust-lang#12715 : dmski/rust/no-extern-fn-pat, r=alexcr…
Browse files Browse the repository at this point in the history
…ichton

Fixes rust-lang#10877

There was another PR which attempted to fix this in the parser (rust-lang#11804) and which was closed due to inactivity.
This PR modifies typeck instead (as suggested in rust-lang#11804), which indeed seems to be simpler than modifying the parser and allows for a better error message.
  • Loading branch information
bors committed Mar 5, 2014
2 parents 8a55cd9 + 53f3442 commit ff22e47
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 0 deletions.
11 changes: 11 additions & 0 deletions src/librustc/middle/typeck/collect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
24 changes: 24 additions & 0 deletions src/test/compile-fail/issue-10877.rs
Original file line number Diff line number Diff line change
@@ -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() {}

0 comments on commit ff22e47

Please sign in to comment.