From c6ca004f740d16abea4c0c69acb3f372f29a066c Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Fri, 6 Aug 2021 17:23:39 -0700 Subject: [PATCH] Fix clippy warnings --- build.rs | 7 ++++--- src/lib.rs | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/build.rs b/build.rs index 4287730..dcd5321 100644 --- a/build.rs +++ b/build.rs @@ -3,14 +3,15 @@ use std::env; fn main() { let electrum = env::var_os("CARGO_FEATURE_ELECTRUM").map(|_| "electrum".to_string()); let esplora = env::var_os("CARGO_FEATURE_ESPLORA").map(|_| "esplora".to_string()); - let compact_filters = env::var_os("CARGO_FEATURE_COMPACT_FILTERS").map(|_| "compact_filters".to_string()); + let compact_filters = + env::var_os("CARGO_FEATURE_COMPACT_FILTERS").map(|_| "compact_filters".to_string()); - let blockchain_features : Vec = vec!(electrum, esplora, compact_filters) + let blockchain_features: Vec = vec![electrum, esplora, compact_filters] .iter() .map(|f| f.to_owned()) .flatten() .collect(); - + if blockchain_features.len() > 1 { panic!("At most one blockchain client feature can be enabled but these features were enabled: {:?}", blockchain_features) } diff --git a/src/lib.rs b/src/lib.rs index 99091c2..9e739e0 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -97,6 +97,8 @@ pub extern crate bdk; #[macro_use] extern crate serde_json; + +#[cfg(any(feature = "electrum", feature = "esplora", feature = "compact_filters"))] #[macro_use] extern crate bdk_macros; @@ -673,11 +675,11 @@ fn parse_recipient(s: &str) -> Result<(Script, u64), String> { return Err("Invalid format".to_string()); } - let addr = Address::from_str(&parts[0]); + let addr = Address::from_str(parts[0]); if let Err(e) = addr { return Err(format!("{:?}", e)); } - let val = u64::from_str(&parts[1]); + let val = u64::from_str(parts[1]); if let Err(e) = val { return Err(format!("{:?}", e)); } -- 2.49.0