wip: fixed nightly build

clap-rs · Aug 24, 2015 · e6d0e04 · e6d0e04
1 parent 0efcbb6
commit e6d0e04
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/src/app.rs b/src/app.rs
@@ -2391,19 +2391,17 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
             self.print_help();
             self.exit(1);
         }
-        if (!self.subcmds_neg_reqs) || matches.subcommand_name().is_none() {
-            if self.validate_required(&matches) {
-                self.report_error(format!("The following required arguments were not \
-                    supplied:{}",
-                    self.get_required_from(self.required.iter()
-                                                        .map(|s| *s)
-                                                        .collect::<Vec<_>>())
-                        .iter()
-                        .fold(String::new(), |acc, s| acc + &format!("\n\t'{}'",
-                            Format::Error(s))[..])),
-                    true,
-                    Some(matches.args.keys().map(|k| *k).collect()));
-            }
+        if ((!self.subcmds_neg_reqs) || matches.subcommand_name().is_none()) && self.validate_required(&matches) {
+            self.report_error(format!("The following required arguments were not \
+                supplied:{}",
+                self.get_required_from(self.required.iter()
+                                                    .map(|s| *s)
+                                                    .collect::<Vec<_>>())
+                    .iter()
+                    .fold(String::new(), |acc, s| acc + &format!("\n\t'{}'",
+                        Format::Error(s))[..])),
+                true,
+                Some(matches.args.keys().map(|k| *k).collect()));
         }
         if matches.args.is_empty() && matches.subcommand_name().is_none() && self.help_on_no_args {
             self.print_help();