fix: Cargo clippy lints after rust 1.78
This commit is contained in:
parent
08fac47c29
commit
a5fb7fdf50
@ -53,7 +53,8 @@
|
|||||||
//! # Ok::<_, Box<dyn std::error::Error>>(())
|
//! # Ok::<_, Box<dyn std::error::Error>>(())
|
||||||
//! ```
|
//! ```
|
||||||
|
|
||||||
use alloc::string::{String, ToString};
|
use alloc::string::String;
|
||||||
|
use core::fmt;
|
||||||
use core::str::FromStr;
|
use core::str::FromStr;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
@ -79,9 +80,9 @@ pub struct FullyNodedExport {
|
|||||||
pub label: String,
|
pub label: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ToString for FullyNodedExport {
|
impl fmt::Display for FullyNodedExport {
|
||||||
fn to_string(&self) -> String {
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
serde_json::to_string(self).unwrap()
|
write!(f, "{}", serde_json::to_string(self).unwrap())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -213,6 +214,7 @@ impl FullyNodedExport {
|
|||||||
mod test {
|
mod test {
|
||||||
use core::str::FromStr;
|
use core::str::FromStr;
|
||||||
|
|
||||||
|
use crate::std::string::ToString;
|
||||||
use bdk_chain::{BlockId, ConfirmationTime};
|
use bdk_chain::{BlockId, ConfirmationTime};
|
||||||
use bitcoin::hashes::Hash;
|
use bitcoin::hashes::Hash;
|
||||||
use bitcoin::{transaction, BlockHash, Network, Transaction};
|
use bitcoin::{transaction, BlockHash, Network, Transaction};
|
||||||
|
@ -265,7 +265,7 @@ impl Iterator for CheckPointIter {
|
|||||||
|
|
||||||
fn next(&mut self) -> Option<Self::Item> {
|
fn next(&mut self) -> Option<Self::Item> {
|
||||||
let current = self.current.clone()?;
|
let current = self.current.clone()?;
|
||||||
self.current = current.prev.clone();
|
self.current.clone_from(¤t.prev);
|
||||||
Some(CheckPoint(current))
|
Some(CheckPoint(current))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -359,7 +359,7 @@ impl LocalChain {
|
|||||||
/// The [`BTreeMap`] enforces the height order. However, the caller must ensure the blocks are
|
/// The [`BTreeMap`] enforces the height order. However, the caller must ensure the blocks are
|
||||||
/// all of the same chain.
|
/// all of the same chain.
|
||||||
pub fn from_blocks(blocks: BTreeMap<u32, BlockHash>) -> Result<Self, MissingGenesisError> {
|
pub fn from_blocks(blocks: BTreeMap<u32, BlockHash>) -> Result<Self, MissingGenesisError> {
|
||||||
if blocks.get(&0).is_none() {
|
if !blocks.contains_key(&0) {
|
||||||
return Err(MissingGenesisError);
|
return Err(MissingGenesisError);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -255,6 +255,9 @@ impl<K: Ord + Clone> FullScanRequest<K> {
|
|||||||
spks: impl IntoIterator<IntoIter = impl Iterator<Item = (u32, ScriptBuf)> + Send + 'static>,
|
spks: impl IntoIterator<IntoIter = impl Iterator<Item = (u32, ScriptBuf)> + Send + 'static>,
|
||||||
) -> Self {
|
) -> Self {
|
||||||
match self.spks_by_keychain.remove(&keychain) {
|
match self.spks_by_keychain.remove(&keychain) {
|
||||||
|
// clippy here suggests to remove `into_iter` from `spks.into_iter()`, but doing so
|
||||||
|
// results in a compilation error
|
||||||
|
#[allow(clippy::useless_conversion)]
|
||||||
Some(keychain_spks) => self
|
Some(keychain_spks) => self
|
||||||
.spks_by_keychain
|
.spks_by_keychain
|
||||||
.insert(keychain, Box::new(keychain_spks.chain(spks.into_iter()))),
|
.insert(keychain, Box::new(keychain_spks.chain(spks.into_iter()))),
|
||||||
|
@ -260,6 +260,7 @@ mod test {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// The following dummy traits were created to test if SpkIterator is working properly.
|
// The following dummy traits were created to test if SpkIterator is working properly.
|
||||||
|
#[allow(unused)]
|
||||||
trait TestSendStatic: Send + 'static {
|
trait TestSendStatic: Send + 'static {
|
||||||
fn test(&self) -> u32 {
|
fn test(&self) -> u32 {
|
||||||
20
|
20
|
||||||
|
@ -229,7 +229,7 @@ impl<I: Clone + Ord> SpkTxOutIndex<I> {
|
|||||||
/// Here, "unused" means that after the script pubkey was stored in the index, the index has
|
/// Here, "unused" means that after the script pubkey was stored in the index, the index has
|
||||||
/// never scanned a transaction output with it.
|
/// never scanned a transaction output with it.
|
||||||
pub fn is_used(&self, index: &I) -> bool {
|
pub fn is_used(&self, index: &I) -> bool {
|
||||||
self.unused.get(index).is_none()
|
!self.unused.contains(index)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Marks the script pubkey at `index` as used even though it hasn't seen an output spending to it.
|
/// Marks the script pubkey at `index` as used even though it hasn't seen an output spending to it.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user