Skip to content

Commit 7221b07

Browse files
Remove unused argument from nameize.
Also makes nameize non-public since it's only locally used.
1 parent 568874b commit 7221b07

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/libsyntax/ext/tt/macro_parser.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -200,20 +200,20 @@ pub enum NamedMatch {
200200
MatchedNonterminal(Rc<Nonterminal>)
201201
}
202202

203-
pub fn nameize(p_s: &ParseSess, ms: &[TokenTree], res: &[Rc<NamedMatch>])
203+
fn nameize(ms: &[TokenTree], res: &[Rc<NamedMatch>])
204204
-> ParseResult<HashMap<Ident, Rc<NamedMatch>>> {
205-
fn n_rec(p_s: &ParseSess, m: &TokenTree, res: &[Rc<NamedMatch>],
205+
fn n_rec(m: &TokenTree, res: &[Rc<NamedMatch>],
206206
ret_val: &mut HashMap<Ident, Rc<NamedMatch>>, idx: &mut usize)
207207
-> Result<(), (syntax_pos::Span, String)> {
208208
match *m {
209209
TokenTree::Sequence(_, ref seq) => {
210210
for next_m in &seq.tts {
211-
n_rec(p_s, next_m, res, ret_val, idx)?
211+
n_rec(next_m, res, ret_val, idx)?
212212
}
213213
}
214214
TokenTree::Delimited(_, ref delim) => {
215215
for next_m in &delim.tts {
216-
n_rec(p_s, next_m, res, ret_val, idx)?;
216+
n_rec(next_m, res, ret_val, idx)?;
217217
}
218218
}
219219
TokenTree::Token(sp, MatchNt(bind_name, _)) => {
@@ -239,7 +239,7 @@ pub fn nameize(p_s: &ParseSess, ms: &[TokenTree], res: &[Rc<NamedMatch>])
239239
let mut ret_val = HashMap::new();
240240
let mut idx = 0;
241241
for m in ms {
242-
match n_rec(p_s, m, res, &mut ret_val, &mut idx) {
242+
match n_rec(m, res, &mut ret_val, &mut idx) {
243243
Ok(_) => {},
244244
Err((sp, msg)) => return Error(sp, msg),
245245
}
@@ -425,7 +425,7 @@ pub fn parse(sess: &ParseSess, rdr: TtReader, ms: &[TokenTree]) -> NamedParseRes
425425
if eof_eis.len() == 1 {
426426
let v = eof_eis[0].matches.iter_mut()
427427
.map(|dv| dv.pop().unwrap()).collect::<Vec<_>>();
428-
return nameize(sess, ms, &v[..]);
428+
return nameize(ms, &v[..]);
429429
} else if eof_eis.len() > 1 {
430430
return Error(parser.span, "ambiguity: multiple successful parses".to_string());
431431
} else {

0 commit comments

Comments
 (0)