Fix rust stable (1.58.1) clippy errors

Author: notmandatory

examples/compiler.rs

@@ -85,7 +85,7 @@ fn main() -> Result<(), Box<dyn Error>> {
 
     let network = matches
         .value_of("network")
-        .map(|n| Network::from_str(n))
+        .map(Network::from_str)
         .transpose()
         .unwrap()
         .unwrap_or(Network::Testnet);

src/blockchain/any.rs

@@ -108,6 +108,7 @@ macro_rules! impl_inner_method {
 /// It allows switching backend at runtime
 ///
 /// See [this module](crate::blockchain::any)'s documentation for a usage example.
+#[allow(clippy::large_enum_variant)] // TODO fix, see https://rust-lang.github.io/rust-clippy/master/index.html#large_enum_variant
 pub enum AnyBlockchain {
     #[cfg(feature = "electrum")]
     #[cfg_attr(docsrs, doc(cfg(feature = "electrum")))]

src/blockchain/compact_filters/peer.rs

@@ -115,7 +115,7 @@ pub struct Peer {
     writer: Arc<Mutex<TcpStream>>,
     responses: Arc<RwLock<ResponsesMap>>,
 
-    reader_thread: thread::JoinHandle<()>,
+    _reader_thread: thread::JoinHandle<()>,
     connected: Arc<RwLock<bool>>,
 
     mempool: Arc<Mempool>,
@@ -228,7 +228,7 @@ impl Peer {
         Ok(Peer {
             writer,
             responses,
-            reader_thread,
+            _reader_thread: reader_thread,
             connected,
             mempool,
             version,

src/blockchain/rpc.rs

@@ -55,7 +55,7 @@ pub struct RpcBlockchain {
     /// Rpc client to the node, includes the wallet name
     client: Client,
     /// Network used
-    network: Network,
+    _network: Network,
     /// Blockchain capabilities, cached here at startup
     capabilities: HashSet<Capability>,
     /// Skip this many blocks of the blockchain at the first rescan, if None the rescan is done from the genesis block
@@ -405,7 +405,7 @@ impl ConfigurableBlockchain for RpcBlockchain {
 
         Ok(RpcBlockchain {
             client,
-            network,
+            _network: network,
             capabilities,
             _storage_address: storage_address,
             skip_blocks: config.skip_blocks,

src/wallet/export.rs

@@ -96,7 +96,7 @@ impl FromStr for WalletExport {
 }
 
 fn remove_checksum(s: String) -> String {
-    s.splitn(2, '#').next().map(String::from).unwrap()
+    String::from(s.split_once('#').map_or(&*s, |x| x.0))
 }
 
 impl WalletExport {

src/wallet/signer.rs

@@ -448,7 +448,7 @@ impl SignersContainer {
 /// Options for a software signer
 ///
 /// Adjust the behavior of our software signers and the way a transaction is finalized
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Default)]
 pub struct SignOptions {
     /// Whether the signer should trust the `witness_utxo`, if the `non_witness_utxo` hasn't been
     /// provided
@@ -479,16 +479,6 @@ pub struct SignOptions {
     pub allow_all_sighashes: bool,
 }
 
-impl Default for SignOptions {
-    fn default() -> Self {
-        SignOptions {
-            trust_witness_utxo: false,
-            assume_height: None,
-            allow_all_sighashes: false,
-        }
-    }
-}
-
 pub(crate) trait ComputeSighash {
     fn sighash(
         psbt: &psbt::PartiallySignedTransaction,