fix(RequiredValues): fixes a bug where missing values are parsed as m…

…issing arguments
clap-rs · May 3, 2015 · 93c4a72 · 93c4a72
1 parent 80352bf
commit 93c4a72
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/src/app.rs b/src/app.rs
@@ -1356,6 +1356,13 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
             Some(ref a) => {
                 if let Some(o) = self.opts.get(a) {
                     if o.multiple && self.required.is_empty() { () }
+                    else if !o.multiple {
+                        self.report_error(
+                            format!("Argument {} requires a value but none was supplied", o),
+                            true,
+                            true,
+                            Some(matches.args.keys().map(|k| *k).collect::<Vec<_>>() ) );
+                    }
                     else {
                         self.report_error(format!("The following required arguments were not \
                             supplied:\n{}", 
@@ -1371,14 +1378,8 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
                 } else {
                     self.report_error(
                         format!("Argument {} requires a value but none was supplied",
-                            if let Some(f) = self.flags.get(a) {
-                                format!("{}", f)
-                            } else if let Some(o) = self.opts.get(a) {
-                                format!("{}", o)
-                            } else {
-                                format!("{}", self.positionals_idx.get(
-                                    self.positionals_name.get(a).unwrap()).unwrap())
-                            }),
+                            format!("{}", self.positionals_idx.get(
+                                self.positionals_name.get(a).unwrap()).unwrap())),
                             true,
                             true,
                             Some(matches.args.keys().map(|k| *k).collect::<Vec<_>>()));