Replace argparse with structopt

This patch changes the argument handling code to use structopt instead
of argparse using the data structures we introduced in the last patch.
As part of that transition we replace the old Error::ArgparseError
variant with ClapError that stores a structopt::clap::Error.

Because of that replacement, the format of the help messages changed,
breaking some of the tests. Hence, this change adapts them accordingly.
Also clap currently prints the version output to stdout, so we ignore
the version_option test case for now.

1 files changed, 1 insertions, 2 deletions

diff --git a/nitrocli/src/arg_util.rs b/nitrocli/src/arg_util.rs
index 54c1fce..9d46cc7 100644
--- a/nitrocli/src/arg_util.rs
+++ b/nitrocli/src/arg_util.rs
@@ -67,11 +67,10 @@ macro_rules! Command {
       fn execute(
         self,
         ctx: &mut crate::args::ExecCtx<'_>,
-        args: ::std::vec::Vec<::std::string::String>,
       ) -> crate::Result<()> {
         match self {
           $(
-            $name::$var(_) => $exec(ctx, args),
+            $name::$var(args) => $exec(ctx, args),
           )*
         }
       }