Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2025-01-05 17:28:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #306 - birkenfeld:master, r=Vinatorul

Browse source 
fix: grammar error in some conflicting option errors
This commit is contained in:
Homu 2015-10-04 17:47:22 +09:00
commit 32d37f1b80
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clap-tests/run_tests.py
View file

@ -73,7 +73,7 @@ USAGE:
For more information try --help''' For more information try --help'''
_excluded_l = '''error: The argument '-f' cannot be used '-F' _excluded_l = '''error: The argument '-f' cannot be used with '-F'
USAGE: USAGE:
claptests [positional2] -F --long-option-2 <option2> claptests [positional2] -F --long-option-2 <option2>

2
src/app/app.rs
View file

@ -3306,7 +3306,7 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
// Ensure this flag isn't on the mutually excludes list // Ensure this flag isn't on the mutually excludes list
if self.blacklist.contains(&v.name) { if self.blacklist.contains(&v.name) {
matches.args.remove(v.name); matches.args.remove(v.name);
return Err(self.report_error(format!("The argument '{}' cannot be used {}", return Err(self.report_error(format!("The argument '{}' cannot be used with {}",
Format::Warning(format!("-{}", arg)), Format::Warning(format!("-{}", arg)),
match self.blacklisted_from(v.name, matches) { match self.blacklisted_from(v.name, matches) {
Some(name) => format!("'{}'", Format::Warning(name)), Some(name) => format!("'{}'", Format::Warning(name)),