bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Libsyntax has been updated

Browse source
This commit is contained in:
GuillaumeGomez 2015-02-03 23:31:06 +01:00
parent 12f1f4c546
commit 8b12d3ddf9
26 changed files with 93 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -99,7 +99,6 @@ use std::mem;
use std::rc::Rc;
use std::collections::HashMap;
use std::collections::hash_map::Entry::{Vacant, Occupied};
use std::ops::Deref;
// To avoid costly uniqueness checks, we require that `MatchSeq` always has
// a nonempty body.
@ -230,7 +229,7 @@ pub fn nameize(p_s: &ParseSess, ms: &[TokenTree], res: &[Rc<NamedMatch>])
p_s.span_diagnostic
.span_fatal(sp,
&format!("duplicated bind name: {}",
string.deref())[])
&string[])[])
}
}
}
@ -488,7 +487,7 @@ pub fn parse(sess: &ParseSess,
let name_string = token::get_ident(name);
let match_cur = ei.match_cur;
(&mut ei.matches[match_cur]).push(Rc::new(MatchedNonterminal(
parse_nt(&mut rust_parser, span, name_string.deref()))));
parse_nt(&mut rust_parser, span, &name_string[]))));
ei.idx += 1us;
ei.match_cur += 1;
}