Skip to content

Commit b27e23f

Browse files
committed
---
yaml --- r: 151359 b: refs/heads/try2 c: 71a52a2 h: refs/heads/master i: 151357: 78b350f 151355: f201e4c 151351: 0bf7e42 151343: 530e8ac 151327: cabfe0a 151295: 66464db v: v3
1 parent 5584282 commit b27e23f

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
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 0b7954fa809690037bcb80f44d3383329bce48ad
8+
refs/heads/try2: 71a52a2edc76527e3bba92378da633bb1fde3743
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/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)