chore: edition 2024

plugins/cli/src/parser.rs

@@ -3,9 +3,9 @@
 // SPDX-License-Identifier: MIT
 
 use clap::{
+    Arg as ClapArg, ArgAction, ArgMatches, Command,
     builder::{PossibleValue, PossibleValuesParser},
     error::ErrorKind,
-    Arg as ClapArg, ArgAction, ArgMatches, Command,
 };
 use serde::Serialize;
 use serde_json::Value;
@@ -134,8 +134,8 @@ fn get_matches_internal(config: &Config, matches: &ArgMatches) -> Matches {
     let mut cli_matches = Matches::default();
     map_matches(config, matches, &mut cli_matches);
 
-    if let Some((subcommand_name, subcommand_matches)) = matches.subcommand() {
-        if let Some(subcommand_config) = config
+    if let Some((subcommand_name, subcommand_matches)) = matches.subcommand()
+        && let Some(subcommand_config) = config
             .subcommands
             .as_ref()
             .and_then(|s| s.get(subcommand_name))
@@ -145,7 +145,6 @@ fn get_matches_internal(config: &Config, matches: &ArgMatches) -> Matches {
                 get_matches_internal(subcommand_config, subcommand_matches),
             );
         }
-    }
 
     cli_matches
 }