@@ -200,20 +200,20 @@ pub enum NamedMatch {
200
200
MatchedNonterminal ( Rc < Nonterminal > )
201
201
}
202
202
203
- pub fn nameize ( p_s : & ParseSess , ms : & [ TokenTree ] , res : & [ Rc < NamedMatch > ] )
203
+ fn nameize ( ms : & [ TokenTree ] , res : & [ Rc < NamedMatch > ] )
204
204
-> 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 > ] ,
206
206
ret_val : & mut HashMap < Ident , Rc < NamedMatch > > , idx : & mut usize )
207
207
-> Result < ( ) , ( syntax_pos:: Span , String ) > {
208
208
match * m {
209
209
TokenTree :: Sequence ( _, ref seq) => {
210
210
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) ?
212
212
}
213
213
}
214
214
TokenTree :: Delimited ( _, ref delim) => {
215
215
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) ?;
217
217
}
218
218
}
219
219
TokenTree :: Token ( sp, MatchNt ( bind_name, _) ) => {
@@ -239,7 +239,7 @@ pub fn nameize(p_s: &ParseSess, ms: &[TokenTree], res: &[Rc<NamedMatch>])
239
239
let mut ret_val = HashMap :: new ( ) ;
240
240
let mut idx = 0 ;
241
241
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) {
243
243
Ok ( _) => { } ,
244
244
Err ( ( sp, msg) ) => return Error ( sp, msg) ,
245
245
}
@@ -425,7 +425,7 @@ pub fn parse(sess: &ParseSess, rdr: TtReader, ms: &[TokenTree]) -> NamedParseRes
425
425
if eof_eis. len ( ) == 1 {
426
426
let v = eof_eis[ 0 ] . matches . iter_mut ( )
427
427
. map ( |dv| dv. pop ( ) . unwrap ( ) ) . collect :: < Vec < _ > > ( ) ;
428
- return nameize ( sess , ms, & v[ ..] ) ;
428
+ return nameize ( ms, & v[ ..] ) ;
429
429
} else if eof_eis. len ( ) > 1 {
430
430
return Error ( parser. span , "ambiguity: multiple successful parses" . to_string ( ) ) ;
431
431
} else {
0 commit comments