mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

syntax: Fix duplicate attributes on module files

Browse Source 
The outer attributes were manually appended when a module file was parsed, but
the attributes were also added higher up the stack of parsing (when the module
finished parsing). This removes the append in parsing the module file.

Closes #13826
This commit is contained in:
Alex Crichton 2014-05-02 16:39:08 -07:00
parent 0b7954fa80
commit 71a52a2edc
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4155,14 +4155,11 @@ impl<'a> Parser<'a> {
}
};
self.eval_src_mod_from_path(file_path,
outer_attrs.iter().map(|x| *x).collect(),
id_sp)
self.eval_src_mod_from_path(file_path, id_sp)
}
fn eval_src_mod_from_path(&mut self,
path: Path,
outer_attrs: Vec<ast::Attribute> ,
id_sp: Span) -> (ast::Item_, Vec<ast::Attribute> ) {
let mut included_mod_stack = self.sess.included_mod_stack.borrow_mut();
match included_mod_stack.iter().position(|p| *p == path) {
@ -4187,8 +4184,7 @@ impl<'a> Parser<'a> {
&path,
id_sp);
let mod_inner_lo = p0.span.lo;
let (inner, next) = p0.parse_inner_attrs_and_next();
let mod_attrs = outer_attrs.append(inner.as_slice());
let (mod_attrs, next) = p0.parse_inner_attrs_and_next();
let first_item_outer_attrs = next;
let m0 = p0.parse_mod_items(token::EOF, first_item_outer_attrs, mod_inner_lo);
self.sess.included_mod_stack.borrow_mut().pop();