sq: Adapt sq inspect to clap3's derive API.

2 files changed, 8 insertions, 4 deletions

diff --git a/sq/src/commands/inspect.rs b/sq/src/commands/inspect.rs
index 7873c91f..50463324 100644
--- a/sq/src/commands/inspect.rs
+++ b/sq/src/commands/inspect.rs
@@ -17,11 +17,13 @@ use super::dump::Convert;
 use crate::SECONDS_IN_YEAR;
 use crate::SECONDS_IN_DAY;
 
-pub fn inspect(m: &clap::ArgMatches, policy: &dyn Policy, output: &mut dyn io::Write)
+use crate::sq_cli::InspectCommand;
+
+pub fn inspect(c: InspectCommand, policy: &dyn Policy, output: &mut dyn io::Write)
                -> Result<()> {
-    let print_certifications = m.is_present("certifications");
+    let print_certifications = c.certifications;
 
-    let input = m.value_of("input");
+    let input = c.input.as_deref();
     let input_name = input.unwrap_or("-");
     write!(output, "{}: ", input_name)?;
 
diff --git a/sq/src/sq.rs b/sq/src/sq.rs
index dd7853d5..e0fcfd32 100644
--- a/sq/src/sq.rs
+++ b/sq/src/sq.rs
@@ -634,10 +634,12 @@ fn main() -> Result<()> {
             commands::autocrypt::dispatch(config, &command)?;
         },
         Some(("inspect",  m)) => {
+            use clap::FromArgMatches;
+            let command = sq_cli::InspectCommand::from_arg_matches(m)?;
             // sq inspect does not have --output, but commands::inspect does.
             // Work around this mismatch by always creating a stdout output.
             let mut output = config.create_or_stdout_unsafe(None)?;
-            commands::inspect(m, policy, &mut output)?;
+            commands::inspect(command, policy, &mut output)?;
         },
 
         Some(("keyring", m)) => commands::keyring::dispatch(config, m)?,