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

rollup merge of #22497: nikomatsakis/suffixes

Browse source 
Conflicts:
	src/librustc_trans/trans/tvec.rs
This commit is contained in:
Alex Crichton 2015-02-18 14:35:01 -08:00
commit 5250a82f79
351 changed files with 1025 additions and 1028 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libsyntax/ext/tt/macro_parser.rs
View file

@ -488,7 +488,7 @@ pub fn parse(sess: &ParseSess,
let match_cur = ei.match_cur;
(&mut ei.matches[match_cur]).push(Rc::new(MatchedNonterminal(
parse_nt(&mut rust_parser, span, &name_string))));
ei.idx += 1us;
ei.idx += 1;
ei.match_cur += 1;
}
_ => panic!()