Address more code style issues

Author: jurvis

lightning-invoice/src/payment.rs

@@ -497,9 +497,9 @@ where
 		let first_hops = self.payer.first_hops();
 		let inflight_htlcs = self.create_inflight_map(&payment_hash);
 		let route = self.router.find_route(
-				&payer, &params, &payment_hash, Some(&first_hops.iter().collect::<Vec<_>>()),
-				&AccountForInFlightHtlcs { scorer: &mut self.scorer.lock(), inflight_htlcs }
-			).map_err(|e| PaymentError::Routing(e))?;
+			&payer, &params, &payment_hash, Some(&first_hops.iter().collect::<Vec<_>>()),
+			&AccountForInFlightHtlcs { scorer: &mut self.scorer.lock(), inflight_htlcs })
+			.map_err(|e| PaymentError::Routing(e))?;
 
 
 		match send_payment(&route) {
@@ -572,7 +572,7 @@ where
 			.collect();
 
 		self.payment_cache.lock().unwrap().entry(payment_hash)
-			.or_insert(PaymentInfo::new())
+			.or_insert_with(|| PaymentInfo::new())
 			.paths.push(payment_info_route_hops);
 	}
 
@@ -595,7 +595,7 @@ where
 	) -> Result<(), ()> {
 		let attempts = self.payment_cache.lock().unwrap().entry(payment_hash)
 			.and_modify(|info| info.attempts.count += 1 )
-			.or_insert(PaymentInfo {
+			.or_insert_with(|| PaymentInfo {
 				attempts: PaymentAttempts {
 					count: 1,
 					first_attempted_at: T::now(),