Skip to content

Commit aa53cc1

Browse files
ValuedMammalValuedMammal
committed
clippy: fix uninlined format args
1 parent 27899da commit aa53cc1

File tree

19 files changed

+73
-100
lines changed

19 files changed

+73
-100
lines changed

‎examples/example_wallet_electrum/src/main.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fn main() -> Result<(), anyhow::Error> {
3939

4040
let address = wallet.next_unused_address(KeychainKind::External);
4141
wallet.persist(&mut db)?;
42-
println!("Generated Address: {}", address);
42+
println!("Generated Address: {address}");
4343

4444
let balance = wallet.balance();
4545
println!("Wallet balance before syncing: {}", balance.total());
@@ -56,9 +56,9 @@ fn main() -> Result<(), anyhow::Error> {
5656
let mut once = HashSet::<KeychainKind>::new();
5757
move |k, spk_i, _| {
5858
if once.insert(k) {
59-
print!("\nScanning keychain [{:?}]", k);
59+
print!("\nScanning keychain [{k:?}]");
6060
}
61-
print!(" {:<3}", spk_i);
61+
print!(" {spk_i:<3}");
6262
stdout.flush().expect("must flush");
6363
}
6464
});
@@ -74,10 +74,7 @@ fn main() -> Result<(), anyhow::Error> {
7474
println!("Wallet balance after syncing: {}", balance.total());
7575

7676
if balance.total() < SEND_AMOUNT {
77-
println!(
78-
"Please send at least {} to the receiving address",
79-
SEND_AMOUNT
80-
);
77+
println!("Please send at least {SEND_AMOUNT} to the receiving address");
8178
std::process::exit(0);
8279
}
8380

‎examples/example_wallet_esplora_async/src/main.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ async fn main() -> Result<(), anyhow::Error> {
5050
let mut once = BTreeSet::<KeychainKind>::new();
5151
move |keychain, spk_i, _| {
5252
if once.insert(keychain) {
53-
print!("\nScanning keychain [{:?}]", keychain);
53+
print!("\nScanning keychain [{keychain:?}]");
5454
}
55-
print!(" {:<3}", spk_i);
55+
print!(" {spk_i:<3}");
5656
stdout.flush().expect("must flush")
5757
}
5858
});
@@ -69,10 +69,7 @@ async fn main() -> Result<(), anyhow::Error> {
6969
println!("Wallet balance after syncing: {}", balance.total());
7070

7171
if balance.total() < SEND_AMOUNT {
72-
println!(
73-
"Please send at least {} to the receiving address",
74-
SEND_AMOUNT
75-
);
72+
println!("Please send at least {SEND_AMOUNT} to the receiving address");
7673
std::process::exit(0);
7774
}
7875

‎examples/example_wallet_esplora_blocking/src/main.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ fn main() -> Result<(), anyhow::Error> {
5252
let mut once = BTreeSet::<KeychainKind>::new();
5353
move |keychain, spk_i, _| {
5454
if once.insert(keychain) {
55-
print!("\nScanning keychain [{:?}] ", keychain);
55+
print!("\nScanning keychain [{keychain:?}] ");
5656
}
57-
print!(" {:<3}", spk_i);
57+
print!(" {spk_i:<3}");
5858
stdout.flush().expect("must flush")
5959
}
6060
});
@@ -69,10 +69,7 @@ fn main() -> Result<(), anyhow::Error> {
6969
println!("Wallet balance after syncing: {}", balance.total());
7070

7171
if balance.total() < SEND_AMOUNT {
72-
println!(
73-
"Please send at least {} to the receiving address",
74-
SEND_AMOUNT
75-
);
72+
println!("Please send at least {SEND_AMOUNT} to the receiving address");
7673
std::process::exit(0);
7774
}
7875

‎examples/example_wallet_rpc/src/main.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,7 @@ fn main() -> anyhow::Result<()> {
166166
wallet.apply_block_connected_to(&block_emission.block, height, connected_to)?;
167167
wallet.persist(&mut db)?;
168168
let elapsed = start_apply_block.elapsed().as_secs_f32();
169-
println!(
170-
"Applied block {} at height {} in {}s",
171-
hash, height, elapsed
172-
);
169+
println!("Applied block {hash} at height {height} in {elapsed}s");
173170
}
174171
Emission::Mempool(event) => {
175172
let start_apply_mempool = Instant::now();

‎wallet/examples/compiler.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ fn main() -> Result<(), Box<dyn Error>> {
4545
)"
4646
.replace(&[' ', '\n', '\t'][..], "");
4747

48-
println!("Compiling policy: \n{}", policy_str);
48+
println!("Compiling policy: \n{policy_str}");
4949

5050
// Parse the string as a [`Concrete`] type miniscript policy.
5151
let policy = Concrete::<String>::from_str(&policy_str)?;
@@ -54,7 +54,7 @@ fn main() -> Result<(), Box<dyn Error>> {
5454
// `policy.compile()` returns the resulting miniscript from the policy.
5555
let descriptor = Descriptor::new_wsh(policy.compile()?)?.to_string();
5656

57-
println!("Compiled into Descriptor: \n{}", descriptor);
57+
println!("Compiled into Descriptor: \n{descriptor}");
5858

5959
// Create a new wallet from descriptors
6060
let mut wallet = Wallet::create_single(descriptor)

‎wallet/examples/mnemonic_to_descriptors.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ fn main() -> Result<(), anyhow::Error> {
4545
descriptor!(tr((mnemonic_with_passphrase, internal_path)))?
4646
.into_wallet_descriptor(&secp, Network::Testnet)?;
4747

48-
println!("tpub external descriptor: {}", external_descriptor);
49-
println!("tpub internal descriptor: {}", internal_descriptor);
48+
println!("tpub external descriptor: {external_descriptor}");
49+
println!("tpub internal descriptor: {internal_descriptor}");
5050
println!(
5151
"tprv external descriptor: {}",
5252
external_descriptor.to_string_with_secret(&ext_keymap)

‎wallet/examples/policy.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ fn main() -> Result<(), Box<dyn Error>> {
4242
// But they can be used as independent tools also.
4343
let (wallet_desc, keymap) = desc.into_wallet_descriptor(&secp, Network::Testnet)?;
4444

45-
println!("Example Descriptor for policy analysis : {}", wallet_desc);
45+
println!("Example Descriptor for policy analysis : {wallet_desc}");
4646

4747
// Create the signer with the keymap and descriptor.
4848
let signers_container = SignersContainer::build(keymap, &wallet_desc, &secp);
@@ -54,7 +54,7 @@ fn main() -> Result<(), Box<dyn Error>> {
5454
.extract_policy(&signers_container, BuildSatisfaction::None, &secp)?
5555
.expect("We expect a policy");
5656

57-
println!("Derived Policy for the descriptor {:#?}", policy);
57+
println!("Derived Policy for the descriptor {policy:#?}");
5858

5959
Ok(())
6060
}

‎wallet/src/descriptor/checksum.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ mod test {
7676
#[test]
7777
fn test_calc_checksum_invalid_character() {
7878
let sparkle_heart = unsafe { core::str::from_utf8_unchecked(&[240, 159, 146, 150]) };
79-
let invalid_desc = format!("wpkh(tprv8ZgxMBicQKsPdpkqS7Eair4YxjcuuvDPNYmKX3sCniCf16tHEVrjjiSXEkFRnUH77yXc6ZcwHHcL{}fjdi5qUvw3VDfgYiH5mNsj5izuiu2N/1/2/*)", sparkle_heart);
79+
let invalid_desc = format!("wpkh(tprv8ZgxMBicQKsPdpkqS7Eair4YxjcuuvDPNYmKX3sCniCf16tHEVrjjiSXEkFRnUH77yXc6ZcwHHcL{sparkle_heart}fjdi5qUvw3VDfgYiH5mNsj5izuiu2N/1/2/*)");
8080

8181
assert_matches!(
8282
calc_checksum(&invalid_desc),
83-
Err(DescriptorError::Miniscript(miniscript::Error::BadDescriptor(e))) if e == format!("Invalid character in checksum: '{}'", sparkle_heart)
83+
Err(DescriptorError::Miniscript(miniscript::Error::BadDescriptor(e))) if e == format!("Invalid character in checksum: '{sparkle_heart}'")
8484
);
8585
}
8686
}

‎wallet/src/descriptor/error.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,16 @@ impl fmt::Display for Error {
7070
f,
7171
"The descriptor contains multipath keys, which are not supported yet"
7272
),
73-
Self::Key(err) => write!(f, "Key error: {}", err),
74-
Self::Policy(err) => write!(f, "Policy error: {}", err),
73+
Self::Key(err) => write!(f, "Key error: {err}"),
74+
Self::Policy(err) => write!(f, "Policy error: {err}"),
7575
Self::InvalidDescriptorCharacter(char) => {
76-
write!(f, "Invalid descriptor character: {}", char)
76+
write!(f, "Invalid descriptor character: {char}")
7777
}
78-
Self::Bip32(err) => write!(f, "BIP32 error: {}", err),
79-
Self::Base58(err) => write!(f, "Base58 error: {}", err),
80-
Self::Pk(err) => write!(f, "Key-related error: {}", err),
81-
Self::Miniscript(err) => write!(f, "Miniscript error: {}", err),
82-
Self::Hex(err) => write!(f, "Hex decoding error: {}", err),
78+
Self::Bip32(err) => write!(f, "BIP32 error: {err}"),
79+
Self::Base58(err) => write!(f, "Base58 error: {err}"),
80+
Self::Pk(err) => write!(f, "Key-related error: {err}"),
81+
Self::Miniscript(err) => write!(f, "Miniscript error: {err}"),
82+
Self::Hex(err) => write!(f, "Hex decoding error: {err}"),
8383
Self::ExternalAndInternalAreTheSame => {
8484
write!(f, "External and internal descriptors are the same")
8585
}

‎wallet/src/descriptor/policy.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ where
250250
{
251251
let mut map = serializer.serialize_map(Some(input_map.len()))?;
252252
for (k, v) in input_map {
253-
let k_string = format!("{:?}", k);
253+
let k_string = format!("{k:?}");
254254
map.serialize_entry(&k_string, v)?;
255255
}
256256
map.end()
@@ -529,8 +529,8 @@ pub enum PolicyError {
529529
impl fmt::Display for PolicyError {
530530
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
531531
match self {
532-
Self::NotEnoughItemsSelected(err) => write!(f, "Not enough items selected: {}", err),
533-
Self::IndexOutOfRange(index) => write!(f, "Index out of range: {}", index),
532+
Self::NotEnoughItemsSelected(err) => write!(f, "Not enough items selected: {err}"),
533+
Self::IndexOutOfRange(index) => write!(f, "Index out of range: {index}"),
534534
Self::AddOnLeaf => write!(f, "Add on leaf"),
535535
Self::AddOnPartialComplete => write!(f, "Add on partial complete"),
536536
Self::MixedTimelockUnits => write!(f, "Mixed timelock units"),

0 commit comments

Comments
 (0)