Skip to content

Commit 3722270

Browse files
epageepage
committed
style: Clippy
1 parent c638330 commit 3722270

File tree

3 files changed

+39
-39
lines changed

3 files changed

+39
-39
lines changed

‎src/build/app/mod.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -680,8 +680,8 @@ impl<'help> App<'help> {
680680

681681
let mut c = Colorizer::new(false, color);
682682
let parser = Parser::new(self);
683-
let usage = Usage::new(&parser.app, &parser.required);
684-
Help::new(HelpWriter::Buffer(&mut c), &parser.app, &usage, false).write_help()?;
683+
let usage = Usage::new(parser.app, &parser.required);
684+
Help::new(HelpWriter::Buffer(&mut c), parser.app, &usage, false).write_help()?;
685685
c.print()
686686
}
687687

@@ -706,8 +706,8 @@ impl<'help> App<'help> {
706706

707707
let mut c = Colorizer::new(false, color);
708708
let parser = Parser::new(self);
709-
let usage = Usage::new(&parser.app, &parser.required);
710-
Help::new(HelpWriter::Buffer(&mut c), &parser.app, &usage, true).write_help()?;
709+
let usage = Usage::new(parser.app, &parser.required);
710+
Help::new(HelpWriter::Buffer(&mut c), parser.app, &usage, true).write_help()?;
711711
c.print()
712712
}
713713

@@ -731,8 +731,8 @@ impl<'help> App<'help> {
731731
self._build();
732732

733733
let parser = Parser::new(self);
734-
let usage = Usage::new(&parser.app, &parser.required);
735-
Help::new(HelpWriter::Normal(w), &parser.app, &usage, false).write_help()?;
734+
let usage = Usage::new(parser.app, &parser.required);
735+
Help::new(HelpWriter::Normal(w), parser.app, &usage, false).write_help()?;
736736
w.flush()
737737
}
738738

@@ -756,8 +756,8 @@ impl<'help> App<'help> {
756756
self._build();
757757

758758
let parser = Parser::new(self);
759-
let usage = Usage::new(&parser.app, &parser.required);
760-
Help::new(HelpWriter::Normal(w), &parser.app, &usage, true).write_help()?;
759+
let usage = Usage::new(parser.app, &parser.required);
760+
Help::new(HelpWriter::Normal(w), parser.app, &usage, true).write_help()?;
761761
w.flush()
762762
}
763763

@@ -825,7 +825,7 @@ impl<'help> App<'help> {
825825
self._build();
826826

827827
let parser = Parser::new(self);
828-
Usage::new(&parser.app, &parser.required).create_usage_with_title(&[])
828+
Usage::new(parser.app, &parser.required).create_usage_with_title(&[])
829829
}
830830
}
831831

‎src/parse/parser.rs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ impl<'help, 'app> Parser<'help, 'app> {
257257
return Err(ClapError::no_equals(
258258
self.app,
259259
arg,
260-
Usage::new(&self.app, &self.required).create_usage_with_title(&[]),
260+
Usage::new(self.app, &self.required).create_usage_with_title(&[]),
261261
));
262262
}
263263
ParseResult::NoMatchingArg { arg } => {
@@ -272,7 +272,7 @@ impl<'help, 'app> Parser<'help, 'app> {
272272
self.app,
273273
rest,
274274
arg,
275-
Usage::new(&self.app, &self.required).create_usage_no_title(&used),
275+
Usage::new(self.app, &self.required).create_usage_no_title(&used),
276276
))
277277
}
278278
ParseResult::HelpFlag => {
@@ -346,15 +346,15 @@ impl<'help, 'app> Parser<'help, 'app> {
346346
return Err(ClapError::no_equals(
347347
self.app,
348348
arg,
349-
Usage::new(&self.app, &self.required).create_usage_with_title(&[]),
349+
Usage::new(self.app, &self.required).create_usage_with_title(&[]),
350350
))
351351
}
352352
ParseResult::NoMatchingArg { arg } => {
353353
return Err(ClapError::unknown_argument(
354354
self.app,
355355
arg,
356356
None,
357-
Usage::new(&self.app, &self.required).create_usage_with_title(&[]),
357+
Usage::new(self.app, &self.required).create_usage_with_title(&[]),
358358
));
359359
}
360360
ParseResult::HelpFlag => {
@@ -399,7 +399,7 @@ impl<'help, 'app> Parser<'help, 'app> {
399399
self.app,
400400
arg_os.to_str_lossy().into_owned(),
401401
None,
402-
Usage::new(&self.app, &self.required).create_usage_with_title(&[]),
402+
Usage::new(self.app, &self.required).create_usage_with_title(&[]),
403403
));
404404
}
405405

@@ -440,7 +440,7 @@ impl<'help, 'app> Parser<'help, 'app> {
440440
None => {
441441
return Err(ClapError::invalid_utf8(
442442
self.app,
443-
Usage::new(&self.app, &self.required).create_usage_with_title(&[]),
443+
Usage::new(self.app, &self.required).create_usage_with_title(&[]),
444444
));
445445
}
446446
};
@@ -454,7 +454,7 @@ impl<'help, 'app> Parser<'help, 'app> {
454454
if !allow_invalid_utf8 && v.to_str().is_none() {
455455
return Err(ClapError::invalid_utf8(
456456
self.app,
457-
Usage::new(&self.app, &self.required).create_usage_with_title(&[]),
457+
Usage::new(self.app, &self.required).create_usage_with_title(&[]),
458458
));
459459
}
460460
sc_m.add_val_to(
@@ -499,7 +499,7 @@ impl<'help, 'app> Parser<'help, 'app> {
499499
return Err(ClapError::missing_subcommand(
500500
self.app,
501501
bn.to_string(),
502-
Usage::new(&self.app, &self.required).create_usage_with_title(&[]),
502+
Usage::new(self.app, &self.required).create_usage_with_title(&[]),
503503
));
504504
} else if self.is_set(AS::SubcommandRequiredElseHelp) {
505505
debug!("Parser::get_matches_with: SubcommandRequiredElseHelp=true");
@@ -527,7 +527,7 @@ impl<'help, 'app> Parser<'help, 'app> {
527527
return ClapError::unnecessary_double_dash(
528528
self.app,
529529
arg_os.to_str_lossy().into_owned(),
530-
Usage::new(&self.app, &self.required).create_usage_with_title(&[]),
530+
Usage::new(self.app, &self.required).create_usage_with_title(&[]),
531531
);
532532
}
533533
}
@@ -548,7 +548,7 @@ impl<'help, 'app> Parser<'help, 'app> {
548548
.as_ref()
549549
.unwrap_or(&self.app.name)
550550
.to_string(),
551-
Usage::new(&self.app, &self.required).create_usage_with_title(&[]),
551+
Usage::new(self.app, &self.required).create_usage_with_title(&[]),
552552
);
553553
}
554554
// If the argument must be a subcommand.
@@ -567,7 +567,7 @@ impl<'help, 'app> Parser<'help, 'app> {
567567
self.app,
568568
arg_os.to_str_lossy().into_owned(),
569569
None,
570-
Usage::new(&self.app, &self.required).create_usage_with_title(&[]),
570+
Usage::new(self.app, &self.required).create_usage_with_title(&[]),
571571
)
572572
}
573573

@@ -715,7 +715,7 @@ impl<'help, 'app> Parser<'help, 'app> {
715715

716716
if !self.is_set(AS::SubcommandsNegateReqs) {
717717
let reqs =
718-
Usage::new(&self.app, &self.required).get_required_usage_from(&[], None, true); // maybe Some(m)
718+
Usage::new(self.app, &self.required).get_required_usage_from(&[], None, true); // maybe Some(m)
719719

720720
for s in &reqs {
721721
mid_string.push_str(s);
@@ -1557,14 +1557,14 @@ impl<'help, 'app> Parser<'help, 'app> {
15571557
self.app,
15581558
format!("--{}", arg),
15591559
did_you_mean,
1560-
Usage::new(&self.app, &self.required).create_usage_with_title(&*used),
1560+
Usage::new(self.app, &self.required).create_usage_with_title(&*used),
15611561
)
15621562
}
15631563

15641564
pub(crate) fn write_help_err(&self) -> ClapResult<Colorizer> {
1565-
let usage = Usage::new(&self.app, &self.required);
1565+
let usage = Usage::new(self.app, &self.required);
15661566
let mut c = Colorizer::new(true, self.color_help());
1567-
Help::new(HelpWriter::Buffer(&mut c), &self.app, &usage, false).write_help()?;
1567+
Help::new(HelpWriter::Buffer(&mut c), self.app, &usage, false).write_help()?;
15681568
Ok(c)
15691569
}
15701570

@@ -1575,10 +1575,10 @@ impl<'help, 'app> Parser<'help, 'app> {
15751575
);
15761576

15771577
use_long = use_long && self.use_long_help();
1578-
let usage = Usage::new(&self.app, &self.required);
1578+
let usage = Usage::new(self.app, &self.required);
15791579
let mut c = Colorizer::new(false, self.color_help());
15801580

1581-
match Help::new(HelpWriter::Buffer(&mut c), &self.app, &usage, use_long).write_help() {
1581+
match Help::new(HelpWriter::Buffer(&mut c), self.app, &usage, use_long).write_help() {
15821582
Err(e) => e.into(),
15831583
_ => ClapError::for_app(self.app, c, ErrorKind::DisplayHelp, vec![]),
15841584
}

‎src/parse/validator.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
5050
return Err(Error::empty_value(
5151
self.p.app,
5252
o,
53-
Usage::new(&self.p.app, &self.p.required).create_usage_with_title(&[]),
53+
Usage::new(self.p.app, &self.p.required).create_usage_with_title(&[]),
5454
));
5555
}
5656
}
@@ -91,7 +91,7 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
9191
);
9292
return Err(Error::invalid_utf8(
9393
self.p.app,
94-
Usage::new(&self.p.app, &self.p.required).create_usage_with_title(&[]),
94+
Usage::new(self.p.app, &self.p.required).create_usage_with_title(&[]),
9595
));
9696
}
9797
if !arg.possible_vals.is_empty() {
@@ -122,7 +122,7 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
122122
.filter_map(PossibleValue::get_visible_name)
123123
.collect::<Vec<_>>(),
124124
arg,
125-
Usage::new(&self.p.app, &self.p.required).create_usage_with_title(&used),
125+
Usage::new(self.p.app, &self.p.required).create_usage_with_title(&used),
126126
));
127127
}
128128
}
@@ -134,7 +134,7 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
134134
return Err(Error::empty_value(
135135
self.p.app,
136136
arg,
137-
Usage::new(&self.p.app, &self.p.required).create_usage_with_title(&[]),
137+
Usage::new(self.p.app, &self.p.required).create_usage_with_title(&[]),
138138
));
139139
}
140140

@@ -209,7 +209,7 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
209209
self.p.app,
210210
arg,
211211
Vec::new(),
212-
Usage::new(&self.p.app, &self.p.required).create_usage_with_title(&[]),
212+
Usage::new(self.p.app, &self.p.required).create_usage_with_title(&[]),
213213
))
214214
})
215215
}
@@ -264,7 +264,7 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
264264
.chain(used_filtered.iter())
265265
.cloned()
266266
.collect();
267-
Usage::new(&self.p.app, &self.p.required).create_usage_with_title(&required)
267+
Usage::new(self.p.app, &self.p.required).create_usage_with_title(&required)
268268
}
269269

270270
fn gather_requirements(&mut self, matcher: &ArgMatcher) {
@@ -317,7 +317,7 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
317317
return Err(Error::unexpected_multiple_usage(
318318
self.p.app,
319319
a,
320-
Usage::new(&self.p.app, &self.p.required).create_usage_with_title(&[]),
320+
Usage::new(self.p.app, &self.p.required).create_usage_with_title(&[]),
321321
));
322322
}
323323
if let Some(max_occurs) = a.max_occurs {
@@ -332,7 +332,7 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
332332
a,
333333
max_occurs,
334334
occurs,
335-
Usage::new(&self.p.app, &self.p.required).create_usage_with_title(&[]),
335+
Usage::new(self.p.app, &self.p.required).create_usage_with_title(&[]),
336336
));
337337
}
338338
}
@@ -361,7 +361,7 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
361361
} else {
362362
total_num
363363
},
364-
Usage::new(&self.p.app, &self.p.required).create_usage_with_title(&[]),
364+
Usage::new(self.p.app, &self.p.required).create_usage_with_title(&[]),
365365
));
366366
}
367367
}
@@ -378,7 +378,7 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
378378
.expect(INVALID_UTF8)
379379
.to_string(),
380380
a.to_string(),
381-
Usage::new(&self.p.app, &self.p.required).create_usage_with_title(&[]),
381+
Usage::new(self.p.app, &self.p.required).create_usage_with_title(&[]),
382382
));
383383
}
384384
}
@@ -391,7 +391,7 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
391391
a,
392392
num,
393393
ma.num_vals(),
394-
Usage::new(&self.p.app, &self.p.required).create_usage_with_title(&[]),
394+
Usage::new(self.p.app, &self.p.required).create_usage_with_title(&[]),
395395
));
396396
}
397397
num == 0
@@ -404,7 +404,7 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
404404
return Err(Error::empty_value(
405405
self.p.app,
406406
a,
407-
Usage::new(&self.p.app, &self.p.required).create_usage_with_title(&[]),
407+
Usage::new(self.p.app, &self.p.required).create_usage_with_title(&[]),
408408
));
409409
}
410410
Ok(())
@@ -514,7 +514,7 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
514514
self.p.required
515515
);
516516

517-
let usg = Usage::new(&self.p.app, &self.p.required);
517+
let usg = Usage::new(self.p.app, &self.p.required);
518518

519519
let req_args = usg.get_required_usage_from(&incl, Some(matcher), true);
520520

0 commit comments

Comments
 (0)