refactor(Arg): removes duplicate and uses Base, Switched, and Valued …

…internally now
clap-rs · Feb 21, 2017 · fb7057c · fb7057c
1 parent 65b12f9
commit fb7057c
Show file tree

Hide file tree

Showing 13 changed files with 636 additions and 799 deletions.
diff --git a/src/app/mod.rs b/src/app/mod.rs
@@ -24,7 +24,7 @@ use yaml_rust::Yaml;
 // Internal
 use app::help::Help;
 use app::parser::Parser;
-use args::{ArgKind, AnyArg, Arg, ArgGroup, ArgMatcher, ArgMatches, ArgSettings};
+use args::{AnyArg, Arg, ArgGroup, ArgMatcher, ArgMatches, ArgSettings};
 use errors::Error;
 use errors::Result as ClapResult;
 pub use self::settings::AppSettings;
@@ -1373,7 +1373,7 @@ impl<'a, 'b> App<'a, 'b> {
 
         if self.p.is_set(AppSettings::PropagateGlobalValuesDown) {
             for a in &self.p.global_args {
-                matcher.propagate(a.name);
+                matcher.propagate(a.b.name);
             }
         }
 
@@ -1536,7 +1536,6 @@ impl<'n, 'e> AnyArg<'n, 'e> for App<'n, 'e> {
         unreachable!("App struct does not support AnyArg::name, this is a bug!")
     }
     fn id(&self) -> usize { self.p.id }
-    fn kind(&self) -> ArgKind { ArgKind::Subcmd }
     fn overrides(&self) -> Option<&[&'e str]> { None }
     fn requires(&self) -> Option<&[(Option<&'e str>, &'n str)]> { None }
     fn blacklist(&self) -> Option<&[&'e str]> { None }

diff --git a/src/app/parser.rs b/src/app/parser.rs
diff --git a/src/args/any_arg.rs b/src/args/any_arg.rs
@@ -8,7 +8,6 @@ use vec_map::{self, VecMap};
 
 // Internal
 use args::settings::ArgSettings;
-use args::ArgKind;
 
 #[doc(hidden)]
 pub trait AnyArg<'n, 'e>: std_fmt::Display {
@@ -37,7 +36,6 @@ pub trait AnyArg<'n, 'e>: std_fmt::Display {
     fn default_val(&self) -> Option<&'n str>;
     fn default_vals_ifs(&self) -> Option<vec_map::Values<(&'n str, Option<&'e str>, &'e str)>>;
     fn longest_filter(&self) -> bool;
-    fn kind(&self) -> ArgKind;
     fn val_terminator(&self) -> Option<&'e str>;
 }