bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fallout of std::str stabilization

Browse source
This commit is contained in:
Alex Crichton 2014-12-10 19:46:38 -08:00
parent 4908017d59
commit 082bfde412
193 changed files with 2143 additions and 2230 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -153,7 +153,7 @@ pub fn count_names(ms: &[TokenTree]) -> uint {
seq.num_captures
}
&TtDelimited(_, ref delim) => {
count_names(delim.tts.as_slice())
count_names(delim.tts[])
}
&TtToken(_, MatchNt(..)) => {
1
@ -165,7 +165,7 @@ pub fn count_names(ms: &[TokenTree]) -> uint {
pub fn initial_matcher_pos(ms: Rc<Vec<TokenTree>>, sep: Option<Token>, lo: BytePos)
-> Box<MatcherPos> {
let match_idx_hi = count_names(ms.as_slice());
let match_idx_hi = count_names(ms[]);
let matches = Vec::from_fn(match_idx_hi, |_i| Vec::new());
box MatcherPos {
stack: vec![],
@ -229,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.get()).as_slice())
string.get())[])
}
}
}
@ -254,13 +254,13 @@ pub fn parse_or_else(sess: &ParseSess,
rdr: TtReader,
ms: Vec<TokenTree> )
-> HashMap<Ident, Rc<NamedMatch>> {
match parse(sess, cfg, rdr, ms.as_slice()) {
match parse(sess, cfg, rdr, ms[]) {
Success(m) => m,
Failure(sp, str) => {
sess.span_diagnostic.span_fatal(sp, str.as_slice())
sess.span_diagnostic.span_fatal(sp, str[])
}
Error(sp, str) => {
sess.span_diagnostic.span_fatal(sp, str.as_slice())
sess.span_diagnostic.span_fatal(sp, str[])
}
}
}
@ -416,7 +416,7 @@ pub fn parse(sess: &ParseSess,
}
}
TtToken(sp, SubstNt(..)) => {
return Error(sp, "Cannot transcribe in macro LHS".into_string())
return Error(sp, "Cannot transcribe in macro LHS".to_string())
}
seq @ TtDelimited(..) | seq @ TtToken(_, DocComment(..)) => {
let lower_elts = mem::replace(&mut ei.top_elts, Tt(seq));
@ -446,7 +446,7 @@ pub fn parse(sess: &ParseSess,
for dv in eof_eis[0].matches.iter_mut() {
v.push(dv.pop().unwrap());
}
return Success(nameize(sess, ms, v.as_slice()));
return Success(nameize(sess, ms, v[]));
} else if eof_eis.len() > 1u {
return Error(sp, "ambiguity: multiple successful parses".to_string());
} else {
@ -521,7 +521,7 @@ pub fn parse_nt(p: &mut Parser, name: &str) -> Nonterminal {
_ => {
let token_str = pprust::token_to_string(&p.token);
p.fatal((format!("expected ident, found {}",
token_str.as_slice())).as_slice())
token_str[]))[])
}
},
"path" => {
@ -535,8 +535,7 @@ pub fn parse_nt(p: &mut Parser, name: &str) -> Nonterminal {
res
}
_ => {
p.fatal(format!("unsupported builtin nonterminal parser: {}",
name).as_slice())
p.fatal(format!("unsupported builtin nonterminal parser: {}", name)[])
}
}
}