diff options
| author | bors <bors@rust-lang.org> | 2014-02-23 19:26:53 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-02-23 19:26:53 -0800 |
| commit | 3c2650b4d570bee29332e75109687bc3d5d05b5c (patch) | |
| tree | 0132d5e538deebea43c06962c904e3013a862c8c /src/libsyntax/parse | |
| parent | 7cc6b5e0a3a2038d66301906f76cdb778304a3bd (diff) | |
| parent | 317a253b22a512fad46c3749ea86d9674ff18453 (diff) | |
| download | rust-3c2650b4d570bee29332e75109687bc3d5d05b5c.tar.gz rust-3c2650b4d570bee29332e75109687bc3d5d05b5c.zip | |
auto merge of #12328 : nick29581/rust/abi, r=alexcrichton
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 31e16cd8c7d..dac668da343 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -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); |