remove lifetime parameters from ArgMatches

Author: samkim-crypto

token/cli/src/bench.rs

@@ -22,7 +22,7 @@ use {
 };
 
 pub(crate) async fn bench_process_command(
-    matches: &ArgMatches<'_>,
+    matches: &ArgMatches,
     config: &Config<'_>,
     mut signers: Vec<Arc<dyn Signer>>,
     wallet_manager: &mut Option<Rc<RemoteWalletManager>>,

token/cli/src/command.rs

@@ -96,7 +96,7 @@ fn new_throwaway_signer() -> (Arc<dyn Signer>, Pubkey) {
 }
 
 fn get_signer(
-    matches: &ArgMatches<'_>,
+    matches: &ArgMatches,
     keypair_name: &str,
     wallet_manager: &mut Option<Rc<RemoteWalletManager>>,
 ) -> Option<(Arc<dyn Signer>, Pubkey)> {
@@ -108,7 +108,7 @@ fn get_signer(
     })
 }
 
-fn parse_amount_or_all(matches: &ArgMatches<'_>) -> Option<f64> {
+fn parse_amount_or_all(matches: &ArgMatches) -> Option<f64> {
     match matches.value_of("amount").unwrap() {
         "ALL" => None,
         amount => Some(amount.parse::<f64>().unwrap()),
@@ -3445,7 +3445,7 @@ struct ConfidentialTransferArgs {
 
 pub async fn process_command<'a>(
     sub_command: &CommandName,
-    sub_matches: &ArgMatches<'_>,
+    sub_matches: &ArgMatches,
     config: &Config<'a>,
     mut wallet_manager: Option<Rc<RemoteWalletManager>>,
     mut bulk_signers: Vec<Arc<dyn Signer>>,

token/cli/src/config.rs

@@ -28,7 +28,7 @@ use {
 
 type SignersOf = Vec<(Arc<dyn Signer>, Pubkey)>;
 fn signers_of(
-    matches: &ArgMatches<'_>,
+    matches: &ArgMatches,
     name: &str,
     wallet_manager: &mut Option<Rc<RemoteWalletManager>>,
 ) -> Result<Option<SignersOf>, Box<dyn std::error::Error>> {
@@ -73,7 +73,7 @@ pub struct Config<'a> {
 
 impl<'a> Config<'a> {
     pub async fn new(
-        matches: &ArgMatches<'_>,
+        matches: &ArgMatches,
         wallet_manager: &mut Option<Rc<RemoteWalletManager>>,
         bulk_signers: &mut Vec<Arc<dyn Signer>>,
         multisigner_ids: &'a mut Vec<Pubkey>,
@@ -124,7 +124,7 @@ impl<'a> Config<'a> {
     }
 
     fn extract_multisig_signers(
-        matches: &ArgMatches<'_>,
+        matches: &ArgMatches,
         wallet_manager: &mut Option<Rc<RemoteWalletManager>>,
         bulk_signers: &mut Vec<Arc<dyn Signer>>,
         multisigner_ids: &'a mut Vec<Pubkey>,
@@ -144,7 +144,7 @@ impl<'a> Config<'a> {
     }
 
     pub async fn new_with_clients_and_ws_url(
-        matches: &ArgMatches<'_>,
+        matches: &ArgMatches,
         wallet_manager: &mut Option<Rc<RemoteWalletManager>>,
         bulk_signers: &mut Vec<Arc<dyn Signer>>,
         multisigner_ids: &'a mut Vec<Pubkey>,
@@ -331,7 +331,7 @@ impl<'a> Config<'a> {
     // return the associated token address for the default address.
     pub(crate) async fn associated_token_address_or_override(
         &self,
-        arg_matches: &ArgMatches<'_>,
+        arg_matches: &ArgMatches,
         override_name: &str,
         wallet_manager: &mut Option<Rc<RemoteWalletManager>>,
     ) -> Result<Pubkey, Error> {
@@ -350,7 +350,7 @@ impl<'a> Config<'a> {
     // return the associated token address for the default address.
     pub(crate) async fn associated_token_address_for_token_or_override(
         &self,
-        arg_matches: &ArgMatches<'_>,
+        arg_matches: &ArgMatches,
         override_name: &str,
         wallet_manager: &mut Option<Rc<RemoteWalletManager>>,
         token: Option<Pubkey>,
@@ -382,7 +382,7 @@ impl<'a> Config<'a> {
     // address if there is one
     pub(crate) fn pubkey_or_default(
         &self,
-        arg_matches: &ArgMatches<'_>,
+        arg_matches: &ArgMatches,
         address_name: &str,
         wallet_manager: &mut Option<Rc<RemoteWalletManager>>,
     ) -> Result<Pubkey, Error> {