fix: correct syntax in conditional expressions and pattern matching

Author: agentfarmx[bot]

src/main.rs

@@ -522,8 +522,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                     };
 
                     // Create disk configuration if both disk params are provided
-                    let disk_config = if rpc_matches
-                        .is_present("ledger-disk" && rpc_matches.is_present("accounts-disk"))
+                    let disk_config = if rpc_matches.is_present("ledger-disk")
+                        && rpc_matches.is_present("accounts-disk")
                     {
                         Some(ssh_deploy::DiskConfig {
                             ledger_disk: rpc_matches.value_of("ledger-disk").unwrap().to_string(),
@@ -644,7 +644,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
                     println!("Sonic RPC node deployed successfully!");
                 }
-                "solana" => {
+                ("solana", Some(rpc_sub_matches)) => {
                     // Use the enhanced Solana deployment via rpc subcommand
                     let connection_str = rpc_sub_matches
                         .get_one::<String>("connection")
@@ -768,10 +768,10 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                 exit(1);
             }
         }
-        "new_feature_command" => {
+        ("new_feature_command", _) => {
             println!("Expected output for new feature");
         }
-        cmd => {
+        (cmd, _) => {
             eprintln!("Unknown command: {}", cmd);
             exit(1);
         }
@@ -808,4 +808,4 @@ mod test {
         // Assert that the deserialized data matches the original
         assert_eq!(faux, in_faux);
     }
-}
+}

src/utils/clap_compat.rs

@@ -4,7 +4,7 @@
 use clap::ArgMatches;
 
 /// Get a string value from ArgMatches (compatibility with older Clap API)
-pub fn value_of(matches: &ArgMatches, name: &str) -> Option<&str> {
+pub fn value_of<'a>(matches: &'a ArgMatches, name: &str) -> Option<&'a str> {
     matches.get_one::<String>(name).map(|s| s.as_str())
 }
 
@@ -19,14 +19,14 @@ pub fn occurrences_of(matches: &ArgMatches, name: &str) -> u8 {
 }
 
 /// Get a value from ArgMatches and unwrap it (compatibility with older Clap API)
-pub fn value_of_unwrap(matches: &ArgMatches, name: &str) -> &str {
+pub fn value_of_unwrap<'a>(matches: &'a ArgMatches, name: &str) -> &'a str {
     value_of(matches, name).unwrap()
 }
 
 /// Get a value from ArgMatches with a default (compatibility with older Clap API)
-pub fn value_of_or<'a, 'b>(matches: &'a ArgMatches, name: &str, default: &'b str) -> &'a str 
+pub fn value_of_or<'a, 'b>(matches: &'a ArgMatches, name: &str, default: &'b str) -> &'a str
 where
     'b: 'a,
 {
     value_of(matches, name).unwrap_or(default)
-}
+}