bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Include visibility modifier in span of foreign item

Browse source
This commit is contained in:
Marcus Klaas 2015-09-19 00:27:51 +02:00
parent dc1c7975b0
commit e2f3e3ac4f
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 /// 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>> { attrs: Vec<Attribute>) -> PResult<P<ForeignItem>> {
let lo = self.span.lo;
try!(self.expect_keyword(keywords::Fn)); try!(self.expect_keyword(keywords::Fn));
let (ident, mut generics) = try!(self.parse_fn_header()); 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 /// 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>> { attrs: Vec<Attribute>) -> PResult<P<ForeignItem>> {
let lo = self.span.lo;
try!(self.expect_keyword(keywords::Static)); try!(self.expect_keyword(keywords::Static));
let mutbl = try!(self.eat_keyword(keywords::Mut)); let mutbl = try!(self.eat_keyword(keywords::Mut));
@ -5554,11 +5551,11 @@ impl<'a> Parser<'a> {
if self.check_keyword(keywords::Static) { if self.check_keyword(keywords::Static) {
// FOREIGN STATIC ITEM // 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) { if self.check_keyword(keywords::Fn) || self.check_keyword(keywords::Unsafe) {
// FOREIGN FUNCTION ITEM // 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: // FIXME #5668: this will occur for a macro invocation:

24
src/test/compile-fail/issue-28472.rs Normal file
View file

@ -0,0 +1,24 @@
// Copyright 2012-2015 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.
// Check that the visibility modifier is included in the span of foreign items.
extern {
fn foo();
pub //~ ERROR duplicate definition
fn foo();
pub //~ ERROR duplicate definition
static mut foo: u32;
}
fn main() {
}