rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Auto merge of #28503 - marcusklaas:pub-extern, r=alexcrichton

Browse Source 
Fixes https://github.com/rust-lang/rust/issues/28472.
This commit is contained in:
bors
2015-09-20 05:44:45 +00:00
parent fbce4503f8 e2f3e3ac4f
commit fd38a75077
2 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libsyntax/parse/parser.rs
View File

@@ -5037,9 +5037,8 @@ impl<'a> Parser<'a> {
}
/// Parse a function declaration from a foreign module
fn parse_item_foreign_fn(&mut self, vis: ast::Visibility,
fn parse_item_foreign_fn(&mut self, vis: ast::Visibility, lo: BytePos,
attrs: Vec<Attribute>) -> PResult<P<ForeignItem>> {
let lo = self.span.lo;
try!(self.expect_keyword(keywords::Fn));
let (ident, mut generics) = try!(self.parse_fn_header());
@@ -5058,10 +5057,8 @@ impl<'a> Parser<'a> {
}
/// Parse a static item from a foreign module
fn parse_item_foreign_static(&mut self, vis: ast::Visibility,
fn parse_item_foreign_static(&mut self, vis: ast::Visibility, lo: BytePos,
attrs: Vec<Attribute>) -> PResult<P<ForeignItem>> {
let lo = self.span.lo;
try!(self.expect_keyword(keywords::Static));
let mutbl = try!(self.eat_keyword(keywords::Mut));
@@ -5557,11 +5554,11 @@ impl<'a> Parser<'a> {
if self.check_keyword(keywords::Static) {
// FOREIGN STATIC ITEM
return Ok(Some(try!(self.parse_item_foreign_static(visibility, attrs))));
return Ok(Some(try!(self.parse_item_foreign_static(visibility, lo, attrs))));
}
if self.check_keyword(keywords::Fn) || self.check_keyword(keywords::Unsafe) {
// FOREIGN FUNCTION ITEM
return Ok(Some(try!(self.parse_item_foreign_fn(visibility, attrs))));
return Ok(Some(try!(self.parse_item_foreign_fn(visibility, lo, attrs))));
}
// FIXME #5668: this will occur for a macro invocation: