Skip to content

Commit 66af33e

Browse files
committed
---
yaml --- r: 114643 b: refs/heads/auto c: 71a52a2 h: refs/heads/master i: 114641: 3176c1d 114639: 84c2a7c v: v3
1 parent ac40e0e commit 66af33e

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: 0b7954fa809690037bcb80f44d3383329bce48ad
16+
refs/heads/auto: 71a52a2edc76527e3bba92378da633bb1fde3743
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libsyntax/parse/parser.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4155,14 +4155,11 @@ impl<'a> Parser<'a> {
41554155
}
41564156
};
41574157

4158-
self.eval_src_mod_from_path(file_path,
4159-
outer_attrs.iter().map(|x| *x).collect(),
4160-
id_sp)
4158+
self.eval_src_mod_from_path(file_path, id_sp)
41614159
}
41624160

41634161
fn eval_src_mod_from_path(&mut self,
41644162
path: Path,
4165-
outer_attrs: Vec<ast::Attribute> ,
41664163
id_sp: Span) -> (ast::Item_, Vec<ast::Attribute> ) {
41674164
let mut included_mod_stack = self.sess.included_mod_stack.borrow_mut();
41684165
match included_mod_stack.iter().position(|p| *p == path) {
@@ -4187,8 +4184,7 @@ impl<'a> Parser<'a> {
41874184
&path,
41884185
id_sp);
41894186
let mod_inner_lo = p0.span.lo;
4190-
let (inner, next) = p0.parse_inner_attrs_and_next();
4191-
let mod_attrs = outer_attrs.append(inner.as_slice());
4187+
let (mod_attrs, next) = p0.parse_inner_attrs_and_next();
41924188
let first_item_outer_attrs = next;
41934189
let m0 = p0.parse_mod_items(token::EOF, first_item_outer_attrs, mod_inner_lo);
41944190
self.sess.included_mod_stack.borrow_mut().pop();

0 commit comments

Comments
 (0)