Merge pull request #6184 from epage/conflict

fix(parser): Don't panic when subcommands conflict with groups

Author: epage

clap_builder/src/parser/parser.rs

@@ -483,7 +483,8 @@ impl<'cmd> Parser<'cmd> {
                     pos_sc_name.clone(),
                     matcher
                         .arg_ids()
-                        .map(|id| self.cmd.find(id).unwrap().to_string())
+                        // skip groups
+                        .filter_map(|id| self.cmd.find(id).map(|a| a.to_string()))
                         .collect(),
                     Usage::new(self.cmd).create_usage_with_title(&[]),
                 ));

tests/builder/conflicts.rs

@@ -988,3 +988,17 @@ fn args_negate_subcommands_two_levels() {
         Some("sub2")
     );
 }
+
+#[test]
+fn group_conrflicts_with_subcommands() {
+    let c = Command::new("test")
+        .args_conflicts_with_subcommands(true)
+        .arg(arg!(-g --directory <PATH>).global(true))
+        .arg(arg!(<start>))
+        .group(ArgGroup::new("Cli").arg("directory").arg("start"))
+        .subcommand(Command::new("delete").short_flag('d'));
+    let res = c.try_get_matches_from(["test", "-g", "./", "-d"]);
+    assert!(res.is_err());
+    let err = res.err().unwrap();
+    assert_eq!(err.kind(), ErrorKind::ArgumentConflict);
+}