X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Flib.rs;h=33f596fd8b94207e769e45c02c55721e3cb1905e;hb=3e0d55bd2b96ea10ecc744d4cbd9bbfc1ad4ef50;hp=c42f66da5764ec95c656a9b72e6fe10c6c66d771;hpb=17e829217e9fb8af368262256c9700a2bfb98dfa;p=rust-lightning

diff --git a/lightning/src/lib.rs b/lightning/src/lib.rs
index c42f66da..33f596fd 100644
--- a/lightning/src/lib.rs
+++ b/lightning/src/lib.rs
@@ -69,6 +69,7 @@ extern crate hex;
 #[cfg(any(test, feature = "_test_utils"))] extern crate regex;
 
 #[cfg(not(feature = "std"))] extern crate core2;
+#[cfg(not(feature = "std"))] extern crate libm;
 
 #[cfg(ldk_bench)] extern crate criterion;
 
@@ -83,6 +84,8 @@ pub mod onion_message;
 pub mod blinded_path;
 pub mod events;
 
+pub(crate) mod crypto;
+
 #[cfg(feature = "std")]
 /// Re-export of either `core2::io` or `std::io`, depending on the `std` feature flag.
 pub use std::io;
@@ -166,10 +169,40 @@ mod prelude {
 	extern crate hashbrown;
 
 	pub use alloc::{vec, vec::Vec, string::String, collections::VecDeque, boxed::Box};
+
 	#[cfg(not(feature = "hashbrown"))]
-	pub use std::collections::{HashMap, HashSet, hash_map};
+	mod std_hashtables {
+		pub(crate) use std::collections::{HashMap, HashSet, hash_map};
+
+		pub(crate) type OccupiedHashMapEntry<'a, K, V> =
+			std::collections::hash_map::OccupiedEntry<'a, K, V>;
+		pub(crate) type VacantHashMapEntry<'a, K, V> =
+			std::collections::hash_map::VacantEntry<'a, K, V>;
+	}
+	#[cfg(not(feature = "hashbrown"))]
+	pub(crate) use std_hashtables::*;
+
 	#[cfg(feature = "hashbrown")]
-	pub use self::hashbrown::{HashMap, HashSet, hash_map};
+	mod hashbrown_tables {
+		pub(crate) use hashbrown::{HashMap, HashSet, hash_map};
+
+		pub(crate) type OccupiedHashMapEntry<'a, K, V> =
+			hashbrown::hash_map::OccupiedEntry<'a, K, V, hash_map::DefaultHashBuilder>;
+		pub(crate) type VacantHashMapEntry<'a, K, V> =
+			hashbrown::hash_map::VacantEntry<'a, K, V, hash_map::DefaultHashBuilder>;
+	}
+	#[cfg(feature = "hashbrown")]
+	pub(crate) use hashbrown_tables::*;
+
+	pub(crate) fn new_hash_map<K: core::hash::Hash + Eq, V>() -> HashMap<K, V> { HashMap::new() }
+	pub(crate) fn hash_map_with_capacity<K: core::hash::Hash + Eq, V>(cap: usize) -> HashMap<K, V> {
+		HashMap::with_capacity(cap)
+	}
+
+	pub(crate) fn new_hash_set<K: core::hash::Hash + Eq>() -> HashSet<K> { HashSet::new() }
+	pub(crate) fn hash_set_with_capacity<K: core::hash::Hash + Eq>(cap: usize) -> HashSet<K> {
+		HashSet::with_capacity(cap)
+	}
 
 	pub use alloc::borrow::ToOwned;
 	pub use alloc::string::ToString;