Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2024-11-14 00:27:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

imp(Help): moves positionals to standard <> formatting

Browse source
This commit is contained in:
Kevin K 2016-05-08 20:37:51 -04:00
parent cff94579c1
commit 03dfe5ceff
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/args/arg_builder/positional.rs
View file

@ -112,7 +112,7 @@ impl<'n, 'e> PosBuilder<'n, 'e> {
impl<'n, 'e> Display for PosBuilder<'n, 'e> {
fn fmt(&self, f: &mut Formatter) -> Result {
if self.settings.is_set(ArgSettings::Required) {
// if self.settings.is_set(ArgSettings::Required) {
if let Some(ref names) = self.val_names {
try!(write!(f,
"{}",
@ -123,18 +123,18 @@ impl<'n, 'e> Display for PosBuilder<'n, 'e> {
} else {
try!(write!(f, "<{}>", self.name));
}
} else {
if let Some(ref names) = self.val_names {
try!(write!(f,
"{}",
names.values()
.map(|n| format!("[{}]", n))
.collect::<Vec<_>>()
.join(" ")));
} else {
try!(write!(f, "[{}]", self.name));
}
}
// } else {
// if let Some(ref names) = self.val_names {
// try!(write!(f,
// "{}",
// names.values()
// .map(|n| format!("[{}]", n))
// .collect::<Vec<_>>()
// .join(" ")));
// } else {
// try!(write!(f, "[{}]", self.name));
// }
// }
if self.settings.is_set(ArgSettings::Multiple) && self.val_names.is_none() {
try!(write!(f, "..."));
}
@ -250,7 +250,7 @@ mod test {
let mut p = PosBuilder::new("pos", 1);
p.settings.set(ArgSettings::Multiple);
assert_eq!(&*format!("{}", p), "[pos]...");
assert_eq!(&*format!("{}", p), "<pos>...");
}
#[test]
@ -269,7 +269,7 @@ mod test {
vm.insert(1, "file2");
p2.val_names = Some(vm);
assert_eq!(&*format!("{}", p2), "[file1] [file2]");
assert_eq!(&*format!("{}", p2), "<file1> <file2>");
}
#[test]