Make linter and clippy as happy as possible while staying compatible to 1.14.0

Author: sgeisler

src/de.rs

@@ -80,11 +80,7 @@ mod hrp_sm {
 		}
 
 		fn is_final(&self) -> bool {
-			if *self == States::ParseL || *self == States::ParseN {
-				false
-			} else {
-				true
-			}
+			!(*self == States::ParseL || *self == States::ParseN)
 		}
 	}
 
@@ -710,7 +706,6 @@ mod test {
 	use de::ParseError;
 	use secp256k1::{PublicKey, Secp256k1};
 	use bech32::u5;
-	use SignedRawInvoice;
 	use bitcoin_hashes::hex::FromHex;
 	use bitcoin_hashes::sha256::Sha256Hash;
 

src/lib.rs

@@ -37,8 +37,8 @@ const MAX_EXPIRY_TIME: u64 = 60 * 60 * 24 * 356;
 /// please open an issue. If all tests pass you should be able to use this library safely by just
 /// removing this function till we patch it accordingly.
 fn __system_time_size_check() {
-	/// Use 2 * sizeof(u64) as expected size since the expected underlying implementation is storing
-	/// a `Duration` since `SystemTime::UNIX_EPOCH`.
+	// Use 2 * sizeof(u64) as expected size since the expected underlying implementation is storing
+	// a `Duration` since `SystemTime::UNIX_EPOCH`.
 	unsafe { std::mem::transmute::<SystemTime, [u8; 16]>(UNIX_EPOCH); }
 }
 
@@ -205,11 +205,11 @@ impl SiPrefix {
 	/// Returns the multiplier to go from a BTC value to picoBTC implied by this SiPrefix.
 	/// This is effectively 10^12 * the prefix multiplier
 	pub fn multiplier(&self) -> u64 {
-		match self {
-			&SiPrefix::Milli => 1_000_000_000,
-			&SiPrefix::Micro => 1_000_000,
-			&SiPrefix::Nano => 1_000,
-			&SiPrefix::Pico => 1,
+		match *self {
+			SiPrefix::Milli => 1_000_000_000,
+			SiPrefix::Micro => 1_000_000,
+			SiPrefix::Nano => 1_000,
+			SiPrefix::Pico => 1,
 		}
 	}
 
@@ -311,8 +311,6 @@ pub struct RouteHop {
 }
 
 pub mod constants {
-	use bech32::u5;
-
 	pub const TAG_PAYMENT_HASH: u8 = 1;
 	pub const TAG_DESCRIPTION: u8 = 13;
 	pub const TAG_PAYEE_PUB_KEY: u8 = 19;
@@ -323,17 +321,6 @@ pub mod constants {
 	pub const TAG_ROUTE: u8 = 3;
 }
 
-/// FOR INTERNAL USE ONLY! READ BELOW!
-///
-/// It's a convenience function to convert `u8` tags to `u5` tags. Therefore `tag` has to
-/// be in range `[0..32]`.
-///
-/// # Panics
-/// If the `tag` value is not in the range `[0..32]`.
-fn as_u5(tag: u8) -> u5 {
-	u5::try_from_u8(tag).unwrap()
-}
-
 impl InvoiceBuilder<tb::False, tb::False, tb::False> {
 	/// Construct new, empty `InvoiceBuilder`. All necessary fields have to be filled first before
 	/// `InvoiceBuilder::build(self)` becomes available.
@@ -597,7 +584,7 @@ impl SignedRawInvoice {
 			recovered_pub_key = Some(recovered);
 		}
 
-		let pub_key = included_pub_key.or(recovered_pub_key.as_ref())
+		let pub_key = included_pub_key.or_else(|| recovered_pub_key.as_ref())
 			.expect("One is always present");
 
 		let hash = Message::from_slice(&self.hash[..])
@@ -635,8 +622,8 @@ impl SignedRawInvoice {
 /// ```
 macro_rules! find_extract {
     ($iter:expr, $enm:pat, $enm_var:ident) => {
-    	$iter.filter_map(|tf| match tf {
-			&$enm => Some($enm_var),
+    	$iter.filter_map(|tf| match *tf {
+			$enm => Some($enm_var),
 			_ => None,
 		}).next()
     };
@@ -705,8 +692,8 @@ impl RawInvoice {
 		// function's type signature.
 		// TODO: refactor once impl Trait is available
 		fn match_raw(raw: &RawTaggedField) -> Option<&TaggedField> {
-			match raw {
-				&RawTaggedField::KnownSemantics(ref tf) => Some(tf),
+			match *raw {
+				RawTaggedField::KnownSemantics(ref tf) => Some(tf),
 				_ => None,
 			}
 		}
@@ -741,14 +728,14 @@ impl RawInvoice {
 	pub fn fallbacks(&self) -> Vec<&Fallback> {
 		self.known_tagged_fields().filter_map(|tf| match tf {
 			&TaggedField::Fallback(ref f) => Some(f),
-			num_traits => None,
+			_ => None,
 		}).collect::<Vec<&Fallback>>()
 	}
 
 	pub fn routes(&self) -> Vec<&Route> {
 		self.known_tagged_fields().filter_map(|tf| match tf {
 			&TaggedField::Route(ref r) => Some(r),
-			num_traits => None,
+			_ => None,
 		}).collect::<Vec<&Route>>()
 	}
 
@@ -819,7 +806,7 @@ impl Deref for PositiveTimestamp {
 }
 
 impl Invoice {
-	fn into_signed_raw(self) -> SignedRawInvoice {
+	pub fn into_signed_raw(self) -> SignedRawInvoice {
 		self.signed_invoice
 	}
 
@@ -1132,22 +1119,21 @@ mod test {
 
 	#[test]
 	fn test_system_time_bounds_assumptions() {
-		use std::time::{Duration, SystemTime, UNIX_EPOCH};
-
-		/// The upper and lower bounds of `SystemTime` are not part of its public contract and are
-		/// platform specific. That's why we have to test if our assumptions regarding these bounds
-		/// hold on the target platform.
-		///
-		/// If this test fails on your platform, please don't use the library and open an issue
-		/// instead so we can resolve the situation. Currently this library is tested on:
-		///   * Linux (64bit)
+		use std::time::{Duration, UNIX_EPOCH};
+
+		// The upper and lower bounds of `SystemTime` are not part of its public contract and are
+		// platform specific. That's why we have to test if our assumptions regarding these bounds
+		// hold on the target platform.
+		//
+		// If this test fails on your platform, please don't use the library and open an issue
+		// instead so we can resolve the situation. Currently this library is tested on:
+		//   * Linux (64bit)
 		let _ = UNIX_EPOCH + Duration::from_secs(::std::i64::MAX as u64);
 	}
 
 	#[test]
 	fn test_calc_invoice_hash() {
 		use ::{RawInvoice, RawHrp, RawDataPart, Currency, PositiveTimestamp};
-		use secp256k1::*;
 		use ::TaggedField::*;
 
 		let invoice = RawInvoice {
@@ -1186,7 +1172,7 @@ mod test {
 		use {SignedRawInvoice, Signature, RawInvoice, RawHrp, RawDataPart, Currency, Sha256,
 			 PositiveTimestamp};
 
-		let mut invoice = SignedRawInvoice {
+		let invoice = SignedRawInvoice {
 			raw_invoice: RawInvoice {
 				hrp: RawHrp {
 					currency: Currency::Bitcoin,

src/ser.rs

@@ -46,9 +46,9 @@ impl Display for RawHrp {
 
 impl Display for Currency {
 	fn fmt(&self, f: &mut Formatter) -> Result<(), fmt::Error> {
-		let currency_code = match self {
-			&Currency::Bitcoin => "bc",
-			&Currency::BitcoinTestnet => "tb",
+		let currency_code = match *self {
+			Currency::Bitcoin => "bc",
+			Currency::BitcoinTestnet => "tb",
 		};
 		write!(f, "{}", currency_code)
 	}