@@ -160,35 +160,35 @@ where
160
160
{
161
161
let is_name = |c| !"{}(\\ /" . contains ( c) ;
162
162
163
- let fail = |input : Input , opening_brace| {
164
- match input . iter_elements ( ) . next ( ) . map ( AsChar :: as_char) {
163
+ let fail = |inp : Input , opening_brace| {
164
+ match inp . iter_elements ( ) . next ( ) . map ( AsChar :: as_char) {
165
165
Some ( '{' ) => {
166
166
if let Ok ( ( _, ( par, ..) ) ) = peek ( tuple ( (
167
167
parameter,
168
168
escaped_reserved_chars0 ( take_while ( is_name) ) ,
169
169
tag ( "}" ) ,
170
- ) ) ) ( input . clone ( ) )
170
+ ) ) ) ( inp . clone ( ) )
171
171
{
172
172
return Error :: NestedParameter (
173
- input . take ( par. 0 . input_len ( ) + 2 ) ,
173
+ inp . take ( par. 0 . input_len ( ) + 2 ) ,
174
174
)
175
175
. failure ( ) ;
176
176
}
177
- return Error :: UnescapedReservedCharacter ( input . take ( 1 ) )
177
+ return Error :: UnescapedReservedCharacter ( inp . take ( 1 ) )
178
178
. failure ( ) ;
179
179
}
180
180
Some ( '(' ) => {
181
- if let Ok ( ( _, opt) ) = peek ( optional) ( input . clone ( ) ) {
181
+ if let Ok ( ( _, opt) ) = peek ( optional) ( inp . clone ( ) ) {
182
182
return Error :: OptionalInParameter (
183
- input . take ( opt. 0 . input_len ( ) + 2 ) ,
183
+ inp . take ( opt. 0 . input_len ( ) + 2 ) ,
184
184
)
185
185
. failure ( ) ;
186
186
}
187
- return Error :: UnescapedReservedCharacter ( input . take ( 1 ) )
187
+ return Error :: UnescapedReservedCharacter ( inp . take ( 1 ) )
188
188
. failure ( ) ;
189
189
}
190
190
Some ( c) if RESERVED_CHARS . contains ( c) => {
191
- return Error :: UnescapedReservedCharacter ( input . take ( 1 ) )
191
+ return Error :: UnescapedReservedCharacter ( inp . take ( 1 ) )
192
192
. failure ( ) ;
193
193
}
194
194
_ => { }
@@ -273,38 +273,38 @@ where
273
273
{
274
274
let is_in_optional = |c| !"(){\\ /" . contains ( c) ;
275
275
276
- let fail = |input : Input , opening_brace| {
277
- match input . iter_elements ( ) . next ( ) . map ( AsChar :: as_char) {
276
+ let fail = |inp : Input , opening_brace| {
277
+ match inp . iter_elements ( ) . next ( ) . map ( AsChar :: as_char) {
278
278
Some ( '(' ) => {
279
279
if let Ok ( ( _, ( opt, ..) ) ) = peek ( tuple ( (
280
280
optional,
281
281
escaped_reserved_chars0 ( take_while ( is_in_optional) ) ,
282
282
tag ( ")" ) ,
283
- ) ) ) ( input . clone ( ) )
283
+ ) ) ) ( inp . clone ( ) )
284
284
{
285
285
return Error :: NestedOptional (
286
- input . take ( opt. 0 . input_len ( ) + 2 ) ,
286
+ inp . take ( opt. 0 . input_len ( ) + 2 ) ,
287
287
)
288
288
. failure ( ) ;
289
289
}
290
- return Error :: UnescapedReservedCharacter ( input . take ( 1 ) )
290
+ return Error :: UnescapedReservedCharacter ( inp . take ( 1 ) )
291
291
. failure ( ) ;
292
292
}
293
293
Some ( '{' ) => {
294
- if let Ok ( ( _, par) ) = peek ( parameter) ( input . clone ( ) ) {
294
+ if let Ok ( ( _, par) ) = peek ( parameter) ( inp . clone ( ) ) {
295
295
return Error :: ParameterInOptional (
296
- input . take ( par. 0 . input_len ( ) + 2 ) ,
296
+ inp . take ( par. 0 . input_len ( ) + 2 ) ,
297
297
)
298
298
. failure ( ) ;
299
299
}
300
- return Error :: UnescapedReservedCharacter ( input . take ( 1 ) )
300
+ return Error :: UnescapedReservedCharacter ( inp . take ( 1 ) )
301
301
. failure ( ) ;
302
302
}
303
303
Some ( '/' ) => {
304
- return Error :: AlternationInOptional ( input . take ( 1 ) ) . failure ( ) ;
304
+ return Error :: AlternationInOptional ( inp . take ( 1 ) ) . failure ( ) ;
305
305
}
306
306
Some ( c) if RESERVED_CHARS . contains ( c) => {
307
- return Error :: UnescapedReservedCharacter ( input . take ( 1 ) )
307
+ return Error :: UnescapedReservedCharacter ( inp . take ( 1 ) )
308
308
. failure ( ) ;
309
309
}
310
310
_ => { }
0 commit comments