f - Remove look_up_or_insert

Author: jkczyz

lightning-invoice/src/payment.rs

@@ -195,18 +195,6 @@ pub enum PaymentError {
 
 type PaymentEntry<'a> = hash_map::OccupiedEntry<'a, PaymentHash, usize>;
 
-macro_rules! look_up_or_insert {
-	($payment_cache: ident, $payment_hash: expr) => {
-		loop {
-			let entry = $payment_cache.entry($payment_hash);
-			match entry {
-				hash_map::Entry::Occupied(entry) => break entry,
-				hash_map::Entry::Vacant(entry) => entry.insert(0),
-			};
-		};
-	}
-}
-
 impl<P: Deref, R, S: Deref, L: Deref, E> InvoicePayer<P, R, S, L, E>
 where
 	P::Target: Payer,
@@ -271,7 +259,14 @@ where
 		let mut payment_cache = self.payment_cache.lock().unwrap();
 		let mut entry = match payment_cache.entry(payment_hash) {
 			hash_map::Entry::Occupied(_) => return Err(PaymentError::Invoice("payment pending")),
-			hash_map::Entry::Vacant(_) => look_up_or_insert!(payment_cache, payment_hash),
+			hash_map::Entry::Vacant(entry) => {
+				// TODO: Replace with hash_map::Entry::insert once no longer experimental
+				entry.insert(0);
+				match payment_cache.entry(payment_hash) {
+					hash_map::Entry::Occupied(entry) => entry,
+					hash_map::Entry::Vacant(_) => unreachable!(),
+				}
+			},
 		};
 
 		let payment_secret = Some(invoice.payment_secret().clone());
@@ -428,7 +423,12 @@ where
 				}
 
 				let mut payment_cache = self.payment_cache.lock().unwrap();
-				let mut entry = look_up_or_insert!(payment_cache, *payment_hash);
+				let mut entry = loop {
+					match payment_cache.entry(*payment_hash) {
+						hash_map::Entry::Occupied(entry) => break entry,
+						hash_map::Entry::Vacant(entry) => entry.insert(0),
+					};
+				};
 
 				if *rejected_by_dest {
 					log_trace!(self.logger, "Payment {} rejected by destination; not retrying", log_bytes!(payment_hash.0));