Fix warnings raised by rust 1.95.

Author: fnando

cmd/crates/soroban-spec-typescript/src/lib.rs

@@ -125,10 +125,10 @@ pub fn generate(spec: &[ScSpecEntry]) -> String {
     // Filter out function entries with names that start with "__" and partition the results
     for entry in &collected {
         match entry {
-            Entry::Function { name, inputs, .. } if name == "__constructor" => {
-                if !inputs.is_empty() {
-                    constructor_args = Some(inputs.clone());
-                }
+            Entry::Function { name, inputs, .. }
+                if name == "__constructor" && !inputs.is_empty() =>
+            {
+                constructor_args = Some(inputs.clone());
             }
             _ => {}
         }

cmd/crates/soroban-test/tests/it/build.rs

@@ -763,7 +763,7 @@ fn build_no_error_for_package() {
     let cargo_toml_path = dir_path.join("Cargo.toml");
     let cargo_toml_path_content = std::fs::read_to_string(&cargo_toml_path).unwrap();
     let modified_cargo_toml_content =
-        format!("{cargo_toml_path_content}\n[profile.release]\noverflow-checks = true\n",);
+        format!("{cargo_toml_path_content}\n[profile.release]\noverflow-checks = true\n");
     std::fs::write(&cargo_toml_path, modified_cargo_toml_content).unwrap();
 
     sandbox
@@ -876,7 +876,7 @@ fn build_errors_when_overflow_check_only_applied_to_members() {
     let member_cargo_toml_path = dir_path.join("contracts").join("add").join("Cargo.toml");
     let member_cargo_toml_content = std::fs::read_to_string(&member_cargo_toml_path).unwrap();
     let modified_member_content =
-        format!("{member_cargo_toml_content}\n[profile.release]\noverflow-checks = true\n",);
+        format!("{member_cargo_toml_content}\n[profile.release]\noverflow-checks = true\n");
     std::fs::write(&member_cargo_toml_path, modified_member_content).unwrap();
 
     // Add overflow-checks = true to "add2" member
@@ -887,7 +887,7 @@ fn build_errors_when_overflow_check_only_applied_to_members() {
         .join("Cargo.toml");
     let member_2_cargo_toml_content = std::fs::read_to_string(&member_2_cargo_toml_path).unwrap();
     let modified_member_2_content =
-        format!("{member_2_cargo_toml_content}\n[profile.release]\noverflow-checks = true\n",);
+        format!("{member_2_cargo_toml_content}\n[profile.release]\noverflow-checks = true\n");
     std::fs::write(&member_2_cargo_toml_path, modified_member_2_content).unwrap();
 
     sandbox

cmd/crates/stellar-ledger/src/emulator_test_support/http_transport.rs

@@ -73,7 +73,7 @@ impl Exchange for Emulator {
         let resp: Response = HttpClient::new()
             .post(&self.url)
             .headers(headers)
-            .timeout(Duration::from_secs(60))
+            .timeout(Duration::from_mins(1))
             .json(&request)
             .send()
             .await

cmd/soroban-cli/src/commands/contract/arg_parsing.rs

@@ -629,8 +629,7 @@ fn parse_argument_with_validation(
     // unit variants — from_string in soroban-spec-tools handles both forms correctly.
     let is_union_udt = if let ScSpecTypeDef::Udt(udt) = expected_type {
         spec.find(&udt.name.to_utf8_string_lossy())
-            .map(|entry| matches!(entry, ScSpecEntry::UdtUnionV0(_)))
-            .unwrap_or(false)
+            .is_ok_and(|entry| matches!(entry, ScSpecEntry::UdtUnionV0(_)))
     } else {
         false
     };

cmd/soroban-cli/src/commands/contract/init.rs

@@ -1,6 +1,6 @@
 use std::borrow::Cow;
 use std::{
-    fs::{create_dir_all, metadata, write, Metadata},
+    fs::{create_dir_all, metadata, write},
     io,
     path::{Path, PathBuf},
     str,
@@ -158,10 +158,7 @@ impl Runner {
     }
 
     fn file_exists(file_path: &Path) -> bool {
-        metadata(file_path)
-            .as_ref()
-            .map(Metadata::is_file)
-            .unwrap_or(false)
+        metadata(file_path).is_ok_and(|m| m.is_file())
     }
 
     fn create_dir_all(path: &Path) -> Result<(), Error> {

cmd/soroban-cli/src/commands/doctor.rs

@@ -98,7 +98,7 @@ async fn print_network(
         "Network"
     };
 
-    print.globeln(format!("{prefix} {name:?} ({})", network.rpc_url,));
+    print.globeln(format!("{prefix} {name:?} ({})", network.rpc_url));
     print.blankln(format!("protocol {}", version_info.protocol_version));
     print.blankln(format!("rpc {}", version_info.version));
 

cmd/soroban-cli/src/commands/snapshot/create.rs

@@ -380,14 +380,12 @@ impl Cmd {
                                     ScVal::ContractInstance(ScContractInstance {
                                         executable: ContractExecutable::Wasm(hash),
                                         ..
-                                    }) => {
-                                        if !current.wasm_hashes.contains(hash) {
-                                            next.wasm_hashes.insert(hash.clone());
-                                            print.infoln(format!(
-                                                "Adding wasm {} to search",
-                                                hex::encode(hash)
-                                            ));
-                                        }
+                                    }) if !current.wasm_hashes.contains(hash) => {
+                                        next.wasm_hashes.insert(hash.clone());
+                                        print.infoln(format!(
+                                            "Adding wasm {} to search",
+                                            hex::encode(hash)
+                                        ));
                                     }
                                     ScVal::ContractInstance(ScContractInstance {
                                         executable: ContractExecutable::StellarAsset,

cmd/soroban-cli/src/config/data.rs

@@ -131,7 +131,7 @@ impl std::fmt::Display for DatedAction {
                 .map_or_else(|| "SUCCESS".to_string(), |_| "ERROR".to_string()),
             Action::Send { response } => response.status.clone(),
         };
-        write!(f, "{id} {} {status} {datetime} {uri} ", a.type_str(),)
+        write!(f, "{id} {} {status} {datetime} {uri} ", a.type_str())
     }
 }
 

cmd/soroban-cli/src/log/cost.rs

@@ -7,9 +7,9 @@ impl Debug for Cost<'_> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         // TODO: Should we output the footprint here?
         writeln!(f, "==================== Cost ====================")?;
-        writeln!(f, "CPU used: {}", self.0.instructions,)?;
-        writeln!(f, "Bytes read: {}", self.0.disk_read_bytes,)?;
-        writeln!(f, "Bytes written: {}", self.0.write_bytes,)?;
+        writeln!(f, "CPU used: {}", self.0.instructions)?;
+        writeln!(f, "Bytes read: {}", self.0.disk_read_bytes)?;
+        writeln!(f, "Bytes written: {}", self.0.write_bytes)?;
         writeln!(f, "==============================================")?;
         Ok(())
     }

cmd/soroban-cli/src/log/event.rs

@@ -101,17 +101,15 @@ pub fn contract_with_spec(events: &[DiagnosticEvent], print: &Print, spec: Optio
                     },
                 in_successful_contract_call,
                 ..
-            } => {
-                if topics[0] == xdr::ScVal::Symbol(str_to_sc_symbol("log")) {
-                    let status = if in_successful_contract_call {
-                        "Success"
-                    } else {
-                        "Failure"
-                    };
+            } if topics[0] == xdr::ScVal::Symbol(str_to_sc_symbol("log")) => {
+                let status = if in_successful_contract_call {
+                    "Success"
+                } else {
+                    "Failure"
+                };
 
-                    let data = serde_json::to_string(&data).unwrap();
-                    print.logln(format!("{contract_id} - {status} - Log: {data}"));
-                }
+                let data = serde_json::to_string(&data).unwrap();
+                print.logln(format!("{contract_id} - {status} - Log: {data}"));
             }
 
             _ => {}