update pattern matching syntax for subcommand

Author: samkim-crypto

token/cli/src/bench.rs

@@ -30,7 +30,7 @@ pub(crate) async fn bench_process_command(
     assert!(!config.sign_only);
 
     match matches.subcommand() {
-        ("create-accounts", Some(arg_matches)) => {
+        Some(("create-accounts", arg_matches)) => {
             let token = pubkey_of_signer(arg_matches, "token", wallet_manager)
                 .unwrap()
                 .unwrap();
@@ -42,7 +42,7 @@ pub(crate) async fn bench_process_command(
 
             command_create_accounts(config, signers, &token, n, &owner).await?;
         }
-        ("close-accounts", Some(arg_matches)) => {
+        Some(("close-accounts", arg_matches)) => {
             let token = pubkey_of_signer(arg_matches, "token", wallet_manager)
                 .unwrap()
                 .unwrap();
@@ -53,7 +53,7 @@ pub(crate) async fn bench_process_command(
 
             command_close_accounts(config, signers, &token, n, &owner).await?;
         }
-        ("deposit-into", Some(arg_matches)) => {
+        Some(("deposit-into", arg_matches)) => {
             let token = pubkey_of_signer(arg_matches, "token", wallet_manager)
                 .unwrap()
                 .unwrap();
@@ -68,7 +68,7 @@ pub(crate) async fn bench_process_command(
             )
             .await?;
         }
-        ("withdraw-from", Some(arg_matches)) => {
+        Some(("withdraw-from", arg_matches)) => {
             let token = pubkey_of_signer(arg_matches, "token", wallet_manager)
                 .unwrap()
                 .unwrap();

token/cli/src/main.rs

@@ -19,9 +19,8 @@ async fn main() -> Result<(), Error> {
     let mut wallet_manager = None;
     let mut bulk_signers: Vec<Arc<dyn Signer>> = Vec::new();
 
-    let (sub_command, sub_matches) = app_matches.subcommand();
+    let (sub_command, matches) = app_matches.subcommand().unwrap();
     let sub_command = CommandName::from_str(sub_command).unwrap();
-    let matches = sub_matches.unwrap();
 
     let mut multisigner_ids = Vec::new();
     let config = Config::new(

token/cli/tests/command.rs

@@ -439,9 +439,8 @@ where
         &multisig_member_help,
     )
     .get_matches_from(args);
-    let (sub_command, sub_matches) = app_matches.subcommand();
+    let (sub_command, matches) = app_matches.subcommand().unwrap();
     let sub_command = CommandName::from_str(sub_command).unwrap();
-    let matches = sub_matches.unwrap();
 
     let wallet_manager = None;
     let bulk_signers: Vec<Arc<dyn Signer>> = vec![Arc::new(clone_keypair(payer))];
@@ -459,9 +458,8 @@ async fn exec_test_cmd<T: AsRef<OsStr>>(config: &Config<'_>, args: &[T]) -> Comm
         &multisig_member_help,
     )
     .get_matches_from(args);
-    let (sub_command, sub_matches) = app_matches.subcommand();
+    let (sub_command, matches) = app_matches.subcommand().unwrap();
     let sub_command = CommandName::from_str(sub_command).unwrap();
-    let matches = sub_matches.unwrap();
 
     let mut wallet_manager = None;
     let mut bulk_signers: Vec<Arc<dyn Signer>> = Vec::new();