X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Findexed_map.rs;h=97788ffe68acbd5f90d67bd501710c3b5942ce51;hb=59778dac488cff735004671cdefb3f4ac1f920fd;hp=39565f048c07a25f30a6749b5057a55a15278664;hpb=103180df8f3ab77d1d5282bc8546b3072aaa55ec;p=rust-lightning

diff --git a/lightning/src/util/indexed_map.rs b/lightning/src/util/indexed_map.rs
index 39565f04..97788ffe 100644
--- a/lightning/src/util/indexed_map.rs
+++ b/lightning/src/util/indexed_map.rs
@@ -1,10 +1,8 @@
 //! This module has a map which can be iterated in a deterministic order. See the [`IndexedMap`].
 
-use crate::prelude::{HashMap, hash_map};
-use alloc::vec::Vec;
+use crate::prelude::*;
 use alloc::slice::Iter;
 use core::hash::Hash;
-use core::cmp::Ord;
 use core::ops::{Bound, RangeBounds};
 
 /// A map which can be iterated in a deterministic order.
@@ -34,7 +32,7 @@ impl<K: Clone + Hash + Ord, V> IndexedMap<K, V> {
 	/// Constructs a new, empty map
 	pub fn new() -> Self {
 		Self {
-			map: HashMap::new(),
+			map: new_hash_map(),
 			keys: Vec::new(),
 		}
 	}
@@ -42,7 +40,7 @@ impl<K: Clone + Hash + Ord, V> IndexedMap<K, V> {
 	/// Constructs a new, empty map with the given capacity pre-allocated
 	pub fn with_capacity(capacity: usize) -> Self {
 		Self {
-			map: HashMap::with_capacity(capacity),
+			map: hash_map_with_capacity(capacity),
 			keys: Vec::with_capacity(capacity),
 		}
 	}
@@ -58,6 +56,11 @@ impl<K: Clone + Hash + Ord, V> IndexedMap<K, V> {
 		self.map.get_mut(key)
 	}
 
+	/// Fetches the key-value pair corresponding to the supplied key, if one exists.
+	pub fn get_key_value(&self, key: &K) -> Option<(&K, &V)> {
+		self.map.get_key_value(key)
+	}
+
 	#[inline]
 	/// Returns true if an element with the given `key` exists in the map.
 	pub fn contains_key(&self, key: &K) -> bool {
@@ -176,10 +179,7 @@ impl<'a, K: Hash + Ord, V: 'a> Iterator for Range<'a, K, V> {
 ///
 /// This is not exported to bindings users as bindings provide alternate accessors rather than exposing maps directly.
 pub struct VacantEntry<'a, K: Hash + Ord, V> {
-	#[cfg(feature = "hashbrown")]
-	underlying_entry: hash_map::VacantEntry<'a, K, V, hash_map::DefaultHashBuilder>,
-	#[cfg(not(feature = "hashbrown"))]
-	underlying_entry: hash_map::VacantEntry<'a, K, V>,
+	underlying_entry: VacantHashMapEntry<'a, K, V>,
 	key: K,
 	keys: &'a mut Vec<K>,
 }
@@ -188,10 +188,7 @@ pub struct VacantEntry<'a, K: Hash + Ord, V> {
 ///
 /// This is not exported to bindings users as bindings provide alternate accessors rather than exposing maps directly.
 pub struct OccupiedEntry<'a, K: Hash + Ord, V> {
-	#[cfg(feature = "hashbrown")]
-	underlying_entry: hash_map::OccupiedEntry<'a, K, V, hash_map::DefaultHashBuilder>,
-	#[cfg(not(feature = "hashbrown"))]
-	underlying_entry: hash_map::OccupiedEntry<'a, K, V>,
+	underlying_entry: OccupiedHashMapEntry<'a, K, V>,
 	keys: &'a mut Vec<K>,
 }