bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

auto merge of #12328 : nick29581/rust/abi, r=alexcrichton

Browse source
This commit is contained in:
bors 2014-02-23 19:26:53 -08:00
commit 3c2650b4d5
19 changed files with 53 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/libsyntax/parse/parser.rs
View file

@ -862,11 +862,12 @@ impl Parser {
*/
let opt_abis = if self.eat_keyword(keywords::Extern) {
self.parse_opt_abis()
} else { None };
let abis = if self.eat_keyword(keywords::Extern) {
self.parse_opt_abis().unwrap_or(AbiSet::C())
} else {
AbiSet::Rust()
};
let abis = opt_abis.unwrap_or(AbiSet::Rust());
let purity = self.parse_unsafety();
self.expect_keyword(keywords::Fn);
let (decl, lifetimes) = self.parse_ty_fn_decl(true);