Merge #287: clippy: fix uninlined format args

d75126e clippy: allow `uninlined_format_args` (valued mammal)
cbf0cfe chore: update rust-version to 1.88.0 (valued mammal)
aa53cc1 clippy: fix uninlined format args (valued mammal)

Pull request description:

  Fix #281 by taking clippy's suggestion to inline the arguments to a `format!` string where applicable.

  Also update `rust-version` to 1.88.0, closing #280.

  ### Notes to the reviewers

  I've gone ahead and fixed the clippy warnings, although some have argued that the lint is quite pedantic and not entirely helpful when it comes to style and readability. Therefore I also allowed the lint to prevent clippy from warning about it in the future d75126e. That change can be reverted if/when rust lang moves `uninlined_format_args` back to the pedantic, i.e. not default group of lints rust-lang/rust-clippy#15287.

  ### Checklists

  #### All Submissions:

  * [x] I followed the [contribution guidelines](https://github.com/bitcoindevkit/bdk/blob/master/CONTRIBUTING.md)
  * [ ] ~~This pull request breaks the existing API~~

ACKs for top commit:
  notmandatory:
    ACK d75126e
  oleonardolima:
    ACK d75126e

Tree-SHA512: c34e701fb08f6ada2b0f34c87c93417ca966b021360fa787563f00c6968444028a876bfaf6952cf468f8ad834556b784002d4fc7fd09886fc7420ff1cb6eff9d

Author: notmandatory

examples/example_wallet_electrum/src/main.rs

@@ -39,7 +39,7 @@ fn main() -> Result<(), anyhow::Error> {
 
     let address = wallet.next_unused_address(KeychainKind::External);
     wallet.persist(&mut db)?;
-    println!("Generated Address: {}", address);
+    println!("Generated Address: {address}");
 
     let balance = wallet.balance();
     println!("Wallet balance before syncing: {}", balance.total());
@@ -56,9 +56,9 @@ fn main() -> Result<(), anyhow::Error> {
         let mut once = HashSet::<KeychainKind>::new();
         move |k, spk_i, _| {
             if once.insert(k) {
-                print!("\nScanning keychain [{:?}]", k);
+                print!("\nScanning keychain [{k:?}]");
             }
-            print!(" {:<3}", spk_i);
+            print!(" {spk_i:<3}");
             stdout.flush().expect("must flush");
         }
     });
@@ -74,10 +74,7 @@ fn main() -> Result<(), anyhow::Error> {
     println!("Wallet balance after syncing: {}", balance.total());
 
     if balance.total() < SEND_AMOUNT {
-        println!(
-            "Please send at least {} to the receiving address",
-            SEND_AMOUNT
-        );
+        println!("Please send at least {SEND_AMOUNT} to the receiving address");
         std::process::exit(0);
     }
 

examples/example_wallet_esplora_async/src/main.rs

@@ -50,9 +50,9 @@ async fn main() -> Result<(), anyhow::Error> {
         let mut once = BTreeSet::<KeychainKind>::new();
         move |keychain, spk_i, _| {
             if once.insert(keychain) {
-                print!("\nScanning keychain [{:?}]", keychain);
+                print!("\nScanning keychain [{keychain:?}]");
             }
-            print!(" {:<3}", spk_i);
+            print!(" {spk_i:<3}");
             stdout.flush().expect("must flush")
         }
     });
@@ -69,10 +69,7 @@ async fn main() -> Result<(), anyhow::Error> {
     println!("Wallet balance after syncing: {}", balance.total());
 
     if balance.total() < SEND_AMOUNT {
-        println!(
-            "Please send at least {} to the receiving address",
-            SEND_AMOUNT
-        );
+        println!("Please send at least {SEND_AMOUNT} to the receiving address");
         std::process::exit(0);
     }
 

examples/example_wallet_esplora_blocking/src/main.rs

@@ -52,9 +52,9 @@ fn main() -> Result<(), anyhow::Error> {
         let mut once = BTreeSet::<KeychainKind>::new();
         move |keychain, spk_i, _| {
             if once.insert(keychain) {
-                print!("\nScanning keychain [{:?}] ", keychain);
+                print!("\nScanning keychain [{keychain:?}] ");
             }
-            print!(" {:<3}", spk_i);
+            print!(" {spk_i:<3}");
             stdout.flush().expect("must flush")
         }
     });
@@ -69,10 +69,7 @@ fn main() -> Result<(), anyhow::Error> {
     println!("Wallet balance after syncing: {}", balance.total());
 
     if balance.total() < SEND_AMOUNT {
-        println!(
-            "Please send at least {} to the receiving address",
-            SEND_AMOUNT
-        );
+        println!("Please send at least {SEND_AMOUNT} to the receiving address");
         std::process::exit(0);
     }
 

examples/example_wallet_rpc/src/main.rs

@@ -166,10 +166,7 @@ fn main() -> anyhow::Result<()> {
                 wallet.apply_block_connected_to(&block_emission.block, height, connected_to)?;
                 wallet.persist(&mut db)?;
                 let elapsed = start_apply_block.elapsed().as_secs_f32();
-                println!(
-                    "Applied block {} at height {} in {}s",
-                    hash, height, elapsed
-                );
+                println!("Applied block {hash} at height {height} in {elapsed}s");
             }
             Emission::Mempool(event) => {
                 let start_apply_mempool = Instant::now();

rust-version

@@ -1 +1 @@
-1.87.0
+1.88.0

wallet/examples/compiler.rs

@@ -45,7 +45,7 @@ fn main() -> Result<(), Box<dyn Error>> {
     )"
     .replace(&[' ', '\n', '\t'][..], "");
 
-    println!("Compiling policy: \n{}", policy_str);
+    println!("Compiling policy: \n{policy_str}");
 
     // Parse the string as a [`Concrete`] type miniscript policy.
     let policy = Concrete::<String>::from_str(&policy_str)?;
@@ -54,7 +54,7 @@ fn main() -> Result<(), Box<dyn Error>> {
     // `policy.compile()` returns the resulting miniscript from the policy.
     let descriptor = Descriptor::new_wsh(policy.compile()?)?.to_string();
 
-    println!("Compiled into Descriptor: \n{}", descriptor);
+    println!("Compiled into Descriptor: \n{descriptor}");
 
     // Create a new wallet from descriptors
     let mut wallet = Wallet::create_single(descriptor)

wallet/examples/mnemonic_to_descriptors.rs

@@ -45,8 +45,8 @@ fn main() -> Result<(), anyhow::Error> {
         descriptor!(tr((mnemonic_with_passphrase, internal_path)))?
             .into_wallet_descriptor(&secp, Network::Testnet)?;
 
-    println!("tpub external descriptor: {}", external_descriptor);
-    println!("tpub internal descriptor: {}", internal_descriptor);
+    println!("tpub external descriptor: {external_descriptor}");
+    println!("tpub internal descriptor: {internal_descriptor}");
     println!(
         "tprv external descriptor: {}",
         external_descriptor.to_string_with_secret(&ext_keymap)

wallet/examples/policy.rs

@@ -42,7 +42,7 @@ fn main() -> Result<(), Box<dyn Error>> {
     // But they can be used as independent tools also.
     let (wallet_desc, keymap) = desc.into_wallet_descriptor(&secp, Network::Testnet)?;
 
-    println!("Example Descriptor for policy analysis : {}", wallet_desc);
+    println!("Example Descriptor for policy analysis : {wallet_desc}");
 
     // Create the signer with the keymap and descriptor.
     let signers_container = SignersContainer::build(keymap, &wallet_desc, &secp);
@@ -54,7 +54,7 @@ fn main() -> Result<(), Box<dyn Error>> {
         .extract_policy(&signers_container, BuildSatisfaction::None, &secp)?
         .expect("We expect a policy");
 
-    println!("Derived Policy for the descriptor {:#?}", policy);
+    println!("Derived Policy for the descriptor {policy:#?}");
 
     Ok(())
 }

wallet/src/descriptor/checksum.rs

@@ -76,11 +76,11 @@ mod test {
     #[test]
     fn test_calc_checksum_invalid_character() {
         let sparkle_heart = unsafe { core::str::from_utf8_unchecked(&[240, 159, 146, 150]) };
-        let invalid_desc = format!("wpkh(tprv8ZgxMBicQKsPdpkqS7Eair4YxjcuuvDPNYmKX3sCniCf16tHEVrjjiSXEkFRnUH77yXc6ZcwHHcL{}fjdi5qUvw3VDfgYiH5mNsj5izuiu2N/1/2/*)", sparkle_heart);
+        let invalid_desc = format!("wpkh(tprv8ZgxMBicQKsPdpkqS7Eair4YxjcuuvDPNYmKX3sCniCf16tHEVrjjiSXEkFRnUH77yXc6ZcwHHcL{sparkle_heart}fjdi5qUvw3VDfgYiH5mNsj5izuiu2N/1/2/*)");
 
         assert_matches!(
             calc_checksum(&invalid_desc),
-            Err(DescriptorError::Miniscript(miniscript::Error::BadDescriptor(e))) if e == format!("Invalid character in checksum: '{}'", sparkle_heart)
+            Err(DescriptorError::Miniscript(miniscript::Error::BadDescriptor(e))) if e == format!("Invalid character in checksum: '{sparkle_heart}'")
         );
     }
 }

wallet/src/descriptor/error.rs

@@ -71,16 +71,16 @@ impl fmt::Display for Error {
                 f,
                 "The descriptor contains multipath keys with invalid number of paths (must have exactly 2 paths for receive and change)"
             ),
-            Self::Key(err) => write!(f, "Key error: {}", err),
-            Self::Policy(err) => write!(f, "Policy error: {}", err),
+            Self::Key(err) => write!(f, "Key error: {err}"),
+            Self::Policy(err) => write!(f, "Policy error: {err}"),
             Self::InvalidDescriptorCharacter(char) => {
-                write!(f, "Invalid descriptor character: {}", char)
+                write!(f, "Invalid descriptor character: {char}")
             }
-            Self::Bip32(err) => write!(f, "BIP32 error: {}", err),
-            Self::Base58(err) => write!(f, "Base58 error: {}", err),
-            Self::Pk(err) => write!(f, "Key-related error: {}", err),
-            Self::Miniscript(err) => write!(f, "Miniscript error: {}", err),
-            Self::Hex(err) => write!(f, "Hex decoding error: {}", err),
+            Self::Bip32(err) => write!(f, "BIP32 error: {err}"),
+            Self::Base58(err) => write!(f, "Base58 error: {err}"),
+            Self::Pk(err) => write!(f, "Key-related error: {err}"),
+            Self::Miniscript(err) => write!(f, "Miniscript error: {err}"),
+            Self::Hex(err) => write!(f, "Hex decoding error: {err}"),
             Self::ExternalAndInternalAreTheSame => {
                 write!(f, "External and internal descriptors are the same")
             }