feat: implements posix compatible conflicts for long args

clap-rs · Aug 20, 2015 · 8c2d48a · 8c2d48a
1 parent 70e48d1
commit 8c2d48a
Showing 1 changed file with 22 additions and 0 deletions.
diff --git a/src/app.rs b/src/app.rs
@@ -2570,6 +2570,17 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
                     true,
                     Some(matches.args.keys().map(|k| *k).collect()));
             }
+            self.overrides.dedup();
+            debugln!("checking if {} is in overrides", v.name);
+            if self.overrides.contains(&v.name) {
+                debugln!("it is...");
+                debugln!("checking who defined it...");
+                if let Some(name) = self.overriden_from(v.name, matches) {
+                    debugln!("found {}", name);
+                    matches.args.remove(name);
+                    remove_override!(self, name);
+                }
+            }
             if let Some(ref or) = v.overrides {
                 for pa in or {
                     matches.args.remove(pa);
@@ -2691,6 +2702,17 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
                     true,
                     Some(matches.args.keys().map(|k| *k).collect()));
             }
+            self.overrides.dedup();
+            debugln!("checking if {} is in overrides", v.name);
+            if self.overrides.contains(&v.name) {
+                debugln!("it is...");
+                debugln!("checking who defined it...");
+                if let Some(name) = self.overriden_from(v.name, matches) {
+                    debugln!("found {}", name);
+                    matches.args.remove(name);
+                    remove_override!(self, name);
+                }
+            }
             if let Some(ref or) = v.overrides {
                 for pa in or {
                     matches.args.remove(pa);