From 03dfe5ceff1d63f172788ff688567ddad9fe119b Mon Sep 17 00:00:00 2001 From: Kevin K Date: Sun, 8 May 2016 20:37:51 -0400 Subject: [PATCH] imp(Help): moves positionals to standard <> formatting --- src/args/arg_builder/positional.rs | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/args/arg_builder/positional.rs b/src/args/arg_builder/positional.rs index 69d7120319d..2d67bf9d342 100644 --- a/src/args/arg_builder/positional.rs +++ b/src/args/arg_builder/positional.rs @@ -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::>() - .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::>() + // .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), "..."); } #[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), " "); } #[test]