feat(v2): implementing the base of 2.x

This commit implements the base changes for clap 2.x

Author: kbknapp

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "clap"
-version = "1.5.5"
+version = "2.0.0"
 authors = ["Kevin K. <[email protected]>"]
 exclude = ["examples/*", "clap-tests/*", "tests/*", "benches/*", "*.png", "clap-perf/*"]
 description = "A simple to use, efficient, and full featured  Command Line Argument Parser"
@@ -28,4 +28,3 @@ lints       = ["clippy", "nightly"]
 nightly     = [] # for building with nightly and unstable features
 unstable    = ["lints", "nightly"] # for building with travis-cargo
 debug       = [] # for building with debug messages
-

src/app/macros.rs

@@ -1,6 +1,6 @@
 macro_rules! remove_overriden {
     ($me:ident, $name:expr) => ({
-        if let Some(ref o) = $me.opts.iter().filter(|o| &o.name == $name).next() {
+        if let Some(ref o) = $me.opts.iter().filter(|o| o.name == *$name).next() {
             if let Some(ref ora) = o.requires {
                 for a in ora {
                     vec_remove!($me.required, a);
@@ -16,7 +16,7 @@ macro_rules! remove_overriden {
                     vec_remove!($me.overrides, a);
                 }
             }
-        } else if let Some(ref o) = $me.flags.iter().filter(|f| &f.name == $name).next() {
+        } else if let Some(ref o) = $me.flags.iter().filter(|f| f.name == *$name).next() {
             if let Some(ref ora) = o.requires {
                 for a in ora {
                     vec_remove!($me.required, a);
@@ -32,7 +32,7 @@ macro_rules! remove_overriden {
                     vec_remove!($me.overrides, a);
                 }
             }
-        } else if let Some(p) = $me.positionals.values().filter(|p| &&p.name == &$name).next() {
+        } else if let Some(p) = $me.positionals.values().filter(|p| p.name == *$name).next() {
             if let Some(ref ora) = p.requires {
                 for a in ora {
                     vec_remove!($me.required, a);
@@ -57,14 +57,14 @@ macro_rules! arg_post_processing(
         use args::AnyArg;
         // Handle POSIX overrides
         if $me.overrides.contains(&$arg.name()) {
-            if let Some(ref name) = $me.overriden_from($arg.name(), $matcher) {
+            if let Some(ref name) = $me.overriden_from(&*$arg.name(), $matcher) {
                 $matcher.remove(name);
                 remove_overriden!($me, name);
             }
         }
         if let Some(or) = $arg.overrides() {
             for pa in or {
-                $matcher.remove(pa);
+                $matcher.remove(&*pa);
                 remove_overriden!($me, pa);
                 $me.overrides.push(pa);
                 vec_remove!($me.required, pa);
@@ -83,7 +83,7 @@ macro_rules! arg_post_processing(
         // list
         if let Some(reqs) = $arg.requires() {
             for n in reqs {
-                if $matcher.contains(n) {
+                if $matcher.contains(&*n) {
                     continue;
                 }
 
@@ -109,7 +109,7 @@ macro_rules! _handle_group_reqs{
                         }
                     }
                     if let Some(ref bl) = grp.conflicts {
-                        for b in bl {
+                        for &b in bl {
                             $me.blacklist.push(b);
                         }
                     }
@@ -118,7 +118,7 @@ macro_rules! _handle_group_reqs{
                 }
             }
             if found {
-                for name in grp.args.iter() {
+                for name in &grp.args {
                     if name == &$arg.name() { continue }
                     vec_remove!($me.required, name);
 

src/app/meta.rs

@@ -0,0 +1,44 @@
+pub struct AppMeta<'b> {
+    // The name displayed to the user when showing version and help/usage information
+    pub name: String,
+    pub bin_name: Option<String>,
+    // A string of author(s) if desired. Displayed when showing help/usage information
+    pub author: Option<&'b str>,
+    // The version displayed to the user
+    pub version: Option<&'b str>,
+    // A brief explanation of the program that gets displayed to the user when shown
+    // help/usage
+    // information
+    pub about: Option<&'b str>,
+    // Additional help information
+    pub more_help: Option<&'b str>,
+    pub usage_str: Option<&'b str>,
+    pub usage: Option<String>,
+    pub help_str: Option<&'b str>,
+}
+
+impl<'b> Default for AppMeta<'b> {
+    fn default() -> Self {
+        AppMeta {
+            name: String::new(),
+            author: None,
+            about: None,
+            more_help: None,
+            version: None,
+            usage_str: None,
+            usage: None,
+            bin_name: None,
+            help_str: None,
+        }
+    }
+}
+
+impl<'b> AppMeta<'b> {
+    pub fn new() -> Self { Default::default() }
+    pub fn with_name(s: String) -> Self {
+        AppMeta {
+            name: s,
+            ..Default::default()
+        }
+    }
+}