im(Options): adds number of values to options in help/usage

clap-rs · May 5, 2015 · c1c993c · c1c993c
1 parent 45e481c
commit c1c993c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/src/app.rs b/src/app.rs
@@ -1009,16 +1009,20 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
                                 vec.iter().fold(String::new(), |acc, s| {
                                     acc + &format!("<{}> ", s)[..]
                                 })
+                            } else if let Some(num) = v.num_vals {
+                                (0..num).fold(String::new(), |acc, _| {
+                                    acc + &format!("<{}> ", v.name)[..]
+                                })
                             } else {
                                 format!("<{}>{}", v.name, if v.multiple{"..."} else {""})
                             }),
-                        if v.long.is_some() {
-                            self.get_spaces(
-                                (longest_opt) - (v.long.unwrap().len() + v.name.len() + mult + 1)
-                            )
-                        } else {
-                            self.get_spaces((longest_opt + 3) - (v.name.len() + mult))
-                        },
+                            if v.long.is_some() {
+                                self.get_spaces(
+                                    (longest_opt) - (v.long.unwrap().len() + v.name.len() + mult + 1)
+                                )
+                            } else {
+                                self.get_spaces((longest_opt + 3) - (v.name.len() + mult))
+                            },
                         get_help!(v) );
             }
         }

diff --git a/src/args/argbuilder/option.rs b/src/args/argbuilder/option.rs
@@ -42,6 +42,14 @@ impl<'n> Display for OptBuilder<'n> {
                         format!("-{}", self.short.unwrap())
                     },
                     vec.iter().fold(String::new(),|acc, i| acc + &format!(" <{}>",i)[..]) )
+            } else if let Some(num) = self.num_vals {
+                format!("{}{}",
+                    if self.long.is_some() {
+                        format!("--{}", self.long.unwrap())
+                    } else {
+                        format!("-{}", self.short.unwrap())
+                    },
+                    (0..num).fold(String::new(), |acc, _| acc + &format!(" <{}>", self.name)[..]) )
             } else {
                 format!("{} <{}>{}",
                     if self.long.is_some() {