Skip to content

rustfmt: Fix CI by running rustfmt on util/hash_tables.rs#2919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheBlueMatt merged 1 commit into from
Mar 4, 2024
Merged

rustfmt: Fix CI by running rustfmt on util/hash_tables.rs#2919

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 38 additions & 13 deletions lightning/src/util/hash_tables.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,31 +15,43 @@ extern crate possiblyrandom;

#[cfg(not(feature = "hashbrown"))]
mod std_hashtables {
pub use std::collections::HashMap;
pub use std::collections::hash_map::RandomState;
pub use std::collections::HashMap;

pub(crate) use std::collections::{HashSet, hash_map};
pub(crate) use std::collections::{hash_map, HashSet};

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>;

/// Builds a new [`HashMap`].
pub fn new_hash_map<K, V>() -> HashMap<K, V> { HashMap::new() }
pub fn new_hash_map<K, V>() -> HashMap<K, V> {
HashMap::new()
}
/// Builds a new [`HashMap`] with the given capacity.
pub fn hash_map_with_capacity<K, V>(cap: usize) -> HashMap<K, V> {
HashMap::with_capacity(cap)
}
pub(crate) fn hash_map_from_iter<K: core::hash::Hash + Eq, V, I: IntoIterator<Item=(K, V)>>(iter: I) -> HashMap<K, V> {
pub(crate) fn hash_map_from_iter<
K: core::hash::Hash + Eq,
V,
I: IntoIterator<Item = (K, V)>,
>(
iter: I,
) -> HashMap<K, V> {
HashMap::from_iter(iter)
}

pub(crate) fn new_hash_set<K>() -> HashSet<K> { HashSet::new() }
pub(crate) fn new_hash_set<K>() -> HashSet<K> {
HashSet::new()
}
pub(crate) fn hash_set_with_capacity<K>(cap: usize) -> HashSet<K> {
HashSet::with_capacity(cap)
}
pub(crate) fn hash_set_from_iter<K: core::hash::Hash + Eq, I: IntoIterator<Item=K>>(iter: I) -> HashSet<K> {
pub(crate) fn hash_set_from_iter<K: core::hash::Hash + Eq, I: IntoIterator<Item = K>>(
iter: I,
) -> HashSet<K> {
HashSet::from_iter(iter)
}
}
Expand All@@ -64,15 +76,17 @@ mod hashbrown_tables {
/// A simple implementation of [`BuildHasher`] that uses `getrandom` to opportunistically
/// randomize, if the platform supports it.
pub struct RandomState {
k0: u64, k1: u64,
k0: u64,
k1: u64,
}

impl RandomState {
/// Constructs a new [`RandomState`] which may or may not be random, depending on the
/// target platform.
pub fn new() -> RandomState {
let (k0, k1);
#[cfg(all(not(fuzzing), feature = "possiblyrandom"))] {
#[cfg(all(not(fuzzing), feature = "possiblyrandom"))]
{
let mut keys = [0; 16];
possiblyrandom::getpossiblyrandom(&mut keys);

Expand All@@ -83,7 +97,8 @@ mod hashbrown_tables {
k0 = u64::from_le_bytes(k0_bytes);
k1 = u64::from_le_bytes(k1_bytes);
}
#[cfg(any(fuzzing, not(feature = "possiblyrandom")))] {
#[cfg(any(fuzzing, not(feature = "possiblyrandom")))]
{
k0 = 0;
k1 = 0;
}
Expand All@@ -92,7 +107,9 @@ mod hashbrown_tables {
}

impl Default for RandomState {
fn default() -> RandomState { RandomState::new() }
fn default() -> RandomState {
RandomState::new()
}
}

impl BuildHasher for RandomState {
Expand All@@ -103,8 +120,8 @@ mod hashbrown_tables {
}
}

pub use hasher::*;
use super::*;
pub use hasher::*;

/// The HashMap type used in LDK.
pub type HashMap<K, V> = hashbrown::HashMap<K, V, RandomState>;
Expand All@@ -123,7 +140,13 @@ mod hashbrown_tables {
pub fn hash_map_with_capacity<K, V>(cap: usize) -> HashMap<K, V> {
HashMap::with_capacity_and_hasher(cap, RandomState::new())
}
pub(crate) fn hash_map_from_iter<K: core::hash::Hash + Eq, V, I: IntoIterator<Item=(K, V)>>(iter: I) -> HashMap<K, V> {
pub(crate) fn hash_map_from_iter<
K: core::hash::Hash + Eq,
V,
I: IntoIterator<Item = (K, V)>,
>(
iter: I,
) -> HashMap<K, V> {
let iter = iter.into_iter();
let min_size = iter.size_hint().0;
let mut res = HashMap::with_capacity_and_hasher(min_size, RandomState::new());
Expand All@@ -137,7 +160,9 @@ mod hashbrown_tables {
pub(crate) fn hash_set_with_capacity<K>(cap: usize) -> HashSet<K> {
HashSet::with_capacity_and_hasher(cap, RandomState::new())
}
pub(crate) fn hash_set_from_iter<K: core::hash::Hash + Eq, I: IntoIterator<Item=K>>(iter: I) -> HashSet<K> {
pub(crate) fn hash_set_from_iter<K: core::hash::Hash + Eq, I: IntoIterator<Item = K>>(
iter: I,
) -> HashSet<K> {
let iter = iter.into_iter();
let min_size = iter.size_hint().0;
let mut res = HashSet::with_capacity_and_hasher(min_size, RandomState::new());
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
`rustfmt`: Fix CI by running `rustfmt` on `util/hash_tables.rs` by tnull · Pull Request #2919 · lightningdevkit/rust-lightning · GitHub
Skip to content
rustfmt: Fix CI by running rustfmt on util/hash_tables.rs#2919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 1 commit into

from

Mar 4, 2024
 Merged

rustfmt: Fix CI by running rustfmt on util/hash_tables.rs#2919
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


51 changes: 38 additions & 13 deletions
lightning/src/util/hash_tables.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,31 +15,43 @@ extern crate possiblyrandom;

#[cfg(not(feature = "hashbrown"))]
mod std_hashtables {
	pub use std::collections::HashMap;
	pub use std::collections::hash_map::RandomState;
	pub use std::collections::HashMap;

	pub(crate) use std::collections::{HashSet, hash_map};
	pub(crate) use std::collections::{hash_map, HashSet};

	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>;

	/// Builds a new [`HashMap`].
	pub fn new_hash_map<K, V>() -> HashMap<K, V> { HashMap::new() }
	pub fn new_hash_map<K, V>() -> HashMap<K, V> {
 HashMap::new()
	}
	/// Builds a new [`HashMap`] with the given capacity.
	pub fn hash_map_with_capacity<K, V>(cap: usize) -> HashMap<K, V> {
 HashMap::with_capacity(cap)
	}
	pub(crate) fn hash_map_from_iter<K: core::hash::Hash + Eq, V, I: IntoIterator<Item=(K, V)>>(iter: I) -> HashMap<K, V> {
	pub(crate) fn hash_map_from_iter<
 K: core::hash::Hash + Eq,
 V,
 I: IntoIterator<Item = (K, V)>,
	>(
 iter: I,
	) -> HashMap<K, V> {
 HashMap::from_iter(iter)
	}

	pub(crate) fn new_hash_set<K>() -> HashSet<K> { HashSet::new() }
	pub(crate) fn new_hash_set<K>() -> HashSet<K> {
 HashSet::new()
	}
	pub(crate) fn hash_set_with_capacity<K>(cap: usize) -> HashSet<K> {
 HashSet::with_capacity(cap)
	}
	pub(crate) fn hash_set_from_iter<K: core::hash::Hash + Eq, I: IntoIterator<Item=K>>(iter: I) -> HashSet<K> {
	pub(crate) fn hash_set_from_iter<K: core::hash::Hash + Eq, I: IntoIterator<Item = K>>(
 iter: I,
	) -> HashSet<K> {
 HashSet::from_iter(iter)
	}
}
Expand All@@ -64,15 +76,17 @@ mod hashbrown_tables {
 /// A simple implementation of [`BuildHasher`] that uses `getrandom` to opportunistically
 /// randomize, if the platform supports it.
 pub struct RandomState {
 k0: u64, k1: u64,
 k0: u64,
 k1: u64,
 }

 impl RandomState {
 /// Constructs a new [`RandomState`] which may or may not be random, depending on the
 /// target platform.
 pub fn new() -> RandomState {
 let (k0, k1);
 #[cfg(all(not(fuzzing), feature = "possiblyrandom"))] {
 #[cfg(all(not(fuzzing), feature = "possiblyrandom"))]
 {
 let mut keys = [0; 16];
 possiblyrandom::getpossiblyrandom(&mut keys);

Expand All@@ -83,7 +97,8 @@ mod hashbrown_tables {
 k0 = u64::from_le_bytes(k0_bytes);
 k1 = u64::from_le_bytes(k1_bytes);
 }
 #[cfg(any(fuzzing, not(feature = "possiblyrandom")))] {
 #[cfg(any(fuzzing, not(feature = "possiblyrandom")))]
 {
 k0 = 0;
 k1 = 0;
 }
Expand All@@ -92,7 +107,9 @@ mod hashbrown_tables {
 }

 impl Default for RandomState {
 fn default() -> RandomState { RandomState::new() }
 fn default() -> RandomState {
 RandomState::new()
 }
 }

 impl BuildHasher for RandomState {
Expand All@@ -103,8 +120,8 @@ mod hashbrown_tables {
 }
	}

	pub use hasher::*;
	use super::*;
	pub use hasher::*;

	/// The HashMap type used in LDK.
	pub type HashMap<K, V> = hashbrown::HashMap<K, V, RandomState>;
Expand All@@ -123,7 +140,13 @@ mod hashbrown_tables {
	pub fn hash_map_with_capacity<K, V>(cap: usize) -> HashMap<K, V> {
 HashMap::with_capacity_and_hasher(cap, RandomState::new())
	}
	pub(crate) fn hash_map_from_iter<K: core::hash::Hash + Eq, V, I: IntoIterator<Item=(K, V)>>(iter: I) -> HashMap<K, V> {
	pub(crate) fn hash_map_from_iter<
 K: core::hash::Hash + Eq,
 V,
 I: IntoIterator<Item = (K, V)>,
	>(
 iter: I,
	) -> HashMap<K, V> {
 let iter = iter.into_iter();
 let min_size = iter.size_hint().0;
 let mut res = HashMap::with_capacity_and_hasher(min_size, RandomState::new());
Expand All@@ -137,7 +160,9 @@ mod hashbrown_tables {
	pub(crate) fn hash_set_with_capacity<K>(cap: usize) -> HashSet<K> {
 HashSet::with_capacity_and_hasher(cap, RandomState::new())
	}
	pub(crate) fn hash_set_from_iter<K: core::hash::Hash + Eq, I: IntoIterator<Item=K>>(iter: I) -> HashSet<K> {
	pub(crate) fn hash_set_from_iter<K: core::hash::Hash + Eq, I: IntoIterator<Item = K>>(
 iter: I,
	) -> HashSet<K> {
 let iter = iter.into_iter();
 let min_size = iter.size_hint().0;
 let mut res = HashSet::with_capacity_and_hasher(min_size, RandomState::new());
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
`rustfmt`: Fix CI by running `rustfmt` on `util/hash_tables.rs` by tnull · Pull Request #2919 · lightningdevkit/rust-lightning · GitHub
Skip to content
rustfmt: Fix CI by running rustfmt on util/hash_tables.rs#2919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 1 commit into

from

Mar 4, 2024
 Merged

rustfmt: Fix CI by running rustfmt on util/hash_tables.rs#2919
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


51 changes: 38 additions & 13 deletions
lightning/src/util/hash_tables.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,31 +15,43 @@ extern crate possiblyrandom;

#[cfg(not(feature = "hashbrown"))]
mod std_hashtables {
	pub use std::collections::HashMap;
	pub use std::collections::hash_map::RandomState;
	pub use std::collections::HashMap;

	pub(crate) use std::collections::{HashSet, hash_map};
	pub(crate) use std::collections::{hash_map, HashSet};

	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>;

	/// Builds a new [`HashMap`].
	pub fn new_hash_map<K, V>() -> HashMap<K, V> { HashMap::new() }
	pub fn new_hash_map<K, V>() -> HashMap<K, V> {
 HashMap::new()
	}
	/// Builds a new [`HashMap`] with the given capacity.
	pub fn hash_map_with_capacity<K, V>(cap: usize) -> HashMap<K, V> {
 HashMap::with_capacity(cap)
	}
	pub(crate) fn hash_map_from_iter<K: core::hash::Hash + Eq, V, I: IntoIterator<Item=(K, V)>>(iter: I) -> HashMap<K, V> {
	pub(crate) fn hash_map_from_iter<
 K: core::hash::Hash + Eq,
 V,
 I: IntoIterator<Item = (K, V)>,
	>(
 iter: I,
	) -> HashMap<K, V> {
 HashMap::from_iter(iter)
	}

	pub(crate) fn new_hash_set<K>() -> HashSet<K> { HashSet::new() }
	pub(crate) fn new_hash_set<K>() -> HashSet<K> {
 HashSet::new()
	}
	pub(crate) fn hash_set_with_capacity<K>(cap: usize) -> HashSet<K> {
 HashSet::with_capacity(cap)
	}
	pub(crate) fn hash_set_from_iter<K: core::hash::Hash + Eq, I: IntoIterator<Item=K>>(iter: I) -> HashSet<K> {
	pub(crate) fn hash_set_from_iter<K: core::hash::Hash + Eq, I: IntoIterator<Item = K>>(
 iter: I,
	) -> HashSet<K> {
 HashSet::from_iter(iter)
	}
}
Expand All@@ -64,15 +76,17 @@ mod hashbrown_tables {
 /// A simple implementation of [`BuildHasher`] that uses `getrandom` to opportunistically
 /// randomize, if the platform supports it.
 pub struct RandomState {
 k0: u64, k1: u64,
 k0: u64,
 k1: u64,
 }

 impl RandomState {
 /// Constructs a new [`RandomState`] which may or may not be random, depending on the
 /// target platform.
 pub fn new() -> RandomState {
 let (k0, k1);
 #[cfg(all(not(fuzzing), feature = "possiblyrandom"))] {
 #[cfg(all(not(fuzzing), feature = "possiblyrandom"))]
 {
 let mut keys = [0; 16];
 possiblyrandom::getpossiblyrandom(&mut keys);

Expand All@@ -83,7 +97,8 @@ mod hashbrown_tables {
 k0 = u64::from_le_bytes(k0_bytes);
 k1 = u64::from_le_bytes(k1_bytes);
 }
 #[cfg(any(fuzzing, not(feature = "possiblyrandom")))] {
 #[cfg(any(fuzzing, not(feature = "possiblyrandom")))]
 {
 k0 = 0;
 k1 = 0;
 }
Expand All@@ -92,7 +107,9 @@ mod hashbrown_tables {
 }

 impl Default for RandomState {
 fn default() -> RandomState { RandomState::new() }
 fn default() -> RandomState {
 RandomState::new()
 }
 }

 impl BuildHasher for RandomState {
Expand All@@ -103,8 +120,8 @@ mod hashbrown_tables {
 }
	}

	pub use hasher::*;
	use super::*;
	pub use hasher::*;

	/// The HashMap type used in LDK.
	pub type HashMap<K, V> = hashbrown::HashMap<K, V, RandomState>;
Expand All@@ -123,7 +140,13 @@ mod hashbrown_tables {
	pub fn hash_map_with_capacity<K, V>(cap: usize) -> HashMap<K, V> {
 HashMap::with_capacity_and_hasher(cap, RandomState::new())
	}
	pub(crate) fn hash_map_from_iter<K: core::hash::Hash + Eq, V, I: IntoIterator<Item=(K, V)>>(iter: I) -> HashMap<K, V> {
	pub(crate) fn hash_map_from_iter<
 K: core::hash::Hash + Eq,
 V,
 I: IntoIterator<Item = (K, V)>,
	>(
 iter: I,
	) -> HashMap<K, V> {
 let iter = iter.into_iter();
 let min_size = iter.size_hint().0;
 let mut res = HashMap::with_capacity_and_hasher(min_size, RandomState::new());
Expand All@@ -137,7 +160,9 @@ mod hashbrown_tables {
	pub(crate) fn hash_set_with_capacity<K>(cap: usize) -> HashSet<K> {
 HashSet::with_capacity_and_hasher(cap, RandomState::new())
	}
	pub(crate) fn hash_set_from_iter<K: core::hash::Hash + Eq, I: IntoIterator<Item=K>>(iter: I) -> HashSet<K> {
	pub(crate) fn hash_set_from_iter<K: core::hash::Hash + Eq, I: IntoIterator<Item = K>>(
 iter: I,
	) -> HashSet<K> {
 let iter = iter.into_iter();
 let min_size = iter.size_hint().0;
 let mut res = HashSet::with_capacity_and_hasher(min_size, RandomState::new());
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
`rustfmt`: Fix CI by running `rustfmt` on `util/hash_tables.rs` by tnull · Pull Request #2919 · lightningdevkit/rust-lightning · GitHub
Skip to content
rustfmt: Fix CI by running rustfmt on util/hash_tables.rs#2919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 1 commit into

from

Mar 4, 2024
 Merged

rustfmt: Fix CI by running rustfmt on util/hash_tables.rs#2919
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


51 changes: 38 additions & 13 deletions
lightning/src/util/hash_tables.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,31 +15,43 @@ extern crate possiblyrandom;

#[cfg(not(feature = "hashbrown"))]
mod std_hashtables {
	pub use std::collections::HashMap;
	pub use std::collections::hash_map::RandomState;
	pub use std::collections::HashMap;

	pub(crate) use std::collections::{HashSet, hash_map};
	pub(crate) use std::collections::{hash_map, HashSet};

	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>;

	/// Builds a new [`HashMap`].
	pub fn new_hash_map<K, V>() -> HashMap<K, V> { HashMap::new() }
	pub fn new_hash_map<K, V>() -> HashMap<K, V> {
 HashMap::new()
	}
	/// Builds a new [`HashMap`] with the given capacity.
	pub fn hash_map_with_capacity<K, V>(cap: usize) -> HashMap<K, V> {
 HashMap::with_capacity(cap)
	}
	pub(crate) fn hash_map_from_iter<K: core::hash::Hash + Eq, V, I: IntoIterator<Item=(K, V)>>(iter: I) -> HashMap<K, V> {
	pub(crate) fn hash_map_from_iter<
 K: core::hash::Hash + Eq,
 V,
 I: IntoIterator<Item = (K, V)>,
	>(
 iter: I,
	) -> HashMap<K, V> {
 HashMap::from_iter(iter)
	}

	pub(crate) fn new_hash_set<K>() -> HashSet<K> { HashSet::new() }
	pub(crate) fn new_hash_set<K>() -> HashSet<K> {
 HashSet::new()
	}
	pub(crate) fn hash_set_with_capacity<K>(cap: usize) -> HashSet<K> {
 HashSet::with_capacity(cap)
	}
	pub(crate) fn hash_set_from_iter<K: core::hash::Hash + Eq, I: IntoIterator<Item=K>>(iter: I) -> HashSet<K> {
	pub(crate) fn hash_set_from_iter<K: core::hash::Hash + Eq, I: IntoIterator<Item = K>>(
 iter: I,
	) -> HashSet<K> {
 HashSet::from_iter(iter)
	}
}
Expand All@@ -64,15 +76,17 @@ mod hashbrown_tables {
 /// A simple implementation of [`BuildHasher`] that uses `getrandom` to opportunistically
 /// randomize, if the platform supports it.
 pub struct RandomState {
 k0: u64, k1: u64,
 k0: u64,
 k1: u64,
 }

 impl RandomState {
 /// Constructs a new [`RandomState`] which may or may not be random, depending on the
 /// target platform.
 pub fn new() -> RandomState {
 let (k0, k1);
 #[cfg(all(not(fuzzing), feature = "possiblyrandom"))] {
 #[cfg(all(not(fuzzing), feature = "possiblyrandom"))]
 {
 let mut keys = [0; 16];
 possiblyrandom::getpossiblyrandom(&mut keys);

Expand All@@ -83,7 +97,8 @@ mod hashbrown_tables {
 k0 = u64::from_le_bytes(k0_bytes);
 k1 = u64::from_le_bytes(k1_bytes);
 }
 #[cfg(any(fuzzing, not(feature = "possiblyrandom")))] {
 #[cfg(any(fuzzing, not(feature = "possiblyrandom")))]
 {
 k0 = 0;
 k1 = 0;
 }
Expand All@@ -92,7 +107,9 @@ mod hashbrown_tables {
 }

 impl Default for RandomState {
 fn default() -> RandomState { RandomState::new() }
 fn default() -> RandomState {
 RandomState::new()
 }
 }

 impl BuildHasher for RandomState {
Expand All@@ -103,8 +120,8 @@ mod hashbrown_tables {
 }
	}

	pub use hasher::*;
	use super::*;
	pub use hasher::*;

	/// The HashMap type used in LDK.
	pub type HashMap<K, V> = hashbrown::HashMap<K, V, RandomState>;
Expand All@@ -123,7 +140,13 @@ mod hashbrown_tables {
	pub fn hash_map_with_capacity<K, V>(cap: usize) -> HashMap<K, V> {
 HashMap::with_capacity_and_hasher(cap, RandomState::new())
	}
	pub(crate) fn hash_map_from_iter<K: core::hash::Hash + Eq, V, I: IntoIterator<Item=(K, V)>>(iter: I) -> HashMap<K, V> {
	pub(crate) fn hash_map_from_iter<
 K: core::hash::Hash + Eq,
 V,
 I: IntoIterator<Item = (K, V)>,
	>(
 iter: I,
	) -> HashMap<K, V> {
 let iter = iter.into_iter();
 let min_size = iter.size_hint().0;
 let mut res = HashMap::with_capacity_and_hasher(min_size, RandomState::new());
Expand All@@ -137,7 +160,9 @@ mod hashbrown_tables {
	pub(crate) fn hash_set_with_capacity<K>(cap: usize) -> HashSet<K> {
 HashSet::with_capacity_and_hasher(cap, RandomState::new())
	}
	pub(crate) fn hash_set_from_iter<K: core::hash::Hash + Eq, I: IntoIterator<Item=K>>(iter: I) -> HashSet<K> {
	pub(crate) fn hash_set_from_iter<K: core::hash::Hash + Eq, I: IntoIterator<Item = K>>(
 iter: I,
	) -> HashSet<K> {
 let iter = iter.into_iter();
 let min_size = iter.size_hint().0;
 let mut res = HashSet::with_capacity_and_hasher(min_size, RandomState::new());
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
`rustfmt`: Fix CI by running `rustfmt` on `util/hash_tables.rs` by tnull · Pull Request #2919 · lightningdevkit/rust-lightning · GitHub
Skip to content
rustfmt: Fix CI by running rustfmt on util/hash_tables.rs#2919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 1 commit into

from

Mar 4, 2024
 Merged

rustfmt: Fix CI by running rustfmt on util/hash_tables.rs#2919
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


51 changes: 38 additions & 13 deletions
lightning/src/util/hash_tables.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,31 +15,43 @@ extern crate possiblyrandom;

#[cfg(not(feature = "hashbrown"))]
mod std_hashtables {
	pub use std::collections::HashMap;
	pub use std::collections::hash_map::RandomState;
	pub use std::collections::HashMap;

	pub(crate) use std::collections::{HashSet, hash_map};
	pub(crate) use std::collections::{hash_map, HashSet};

	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>;

	/// Builds a new [`HashMap`].
	pub fn new_hash_map<K, V>() -> HashMap<K, V> { HashMap::new() }
	pub fn new_hash_map<K, V>() -> HashMap<K, V> {
 HashMap::new()
	}
	/// Builds a new [`HashMap`] with the given capacity.
	pub fn hash_map_with_capacity<K, V>(cap: usize) -> HashMap<K, V> {
 HashMap::with_capacity(cap)
	}
	pub(crate) fn hash_map_from_iter<K: core::hash::Hash + Eq, V, I: IntoIterator<Item=(K, V)>>(iter: I) -> HashMap<K, V> {
	pub(crate) fn hash_map_from_iter<
 K: core::hash::Hash + Eq,
 V,
 I: IntoIterator<Item = (K, V)>,
	>(
 iter: I,
	) -> HashMap<K, V> {
 HashMap::from_iter(iter)
	}

	pub(crate) fn new_hash_set<K>() -> HashSet<K> { HashSet::new() }
	pub(crate) fn new_hash_set<K>() -> HashSet<K> {
 HashSet::new()
	}
	pub(crate) fn hash_set_with_capacity<K>(cap: usize) -> HashSet<K> {
 HashSet::with_capacity(cap)
	}
	pub(crate) fn hash_set_from_iter<K: core::hash::Hash + Eq, I: IntoIterator<Item=K>>(iter: I) -> HashSet<K> {
	pub(crate) fn hash_set_from_iter<K: core::hash::Hash + Eq, I: IntoIterator<Item = K>>(
 iter: I,
	) -> HashSet<K> {
 HashSet::from_iter(iter)
	}
}
Expand All@@ -64,15 +76,17 @@ mod hashbrown_tables {
 /// A simple implementation of [`BuildHasher`] that uses `getrandom` to opportunistically
 /// randomize, if the platform supports it.
 pub struct RandomState {
 k0: u64, k1: u64,
 k0: u64,
 k1: u64,
 }

 impl RandomState {
 /// Constructs a new [`RandomState`] which may or may not be random, depending on the
 /// target platform.
 pub fn new() -> RandomState {
 let (k0, k1);
 #[cfg(all(not(fuzzing), feature = "possiblyrandom"))] {
 #[cfg(all(not(fuzzing), feature = "possiblyrandom"))]
 {
 let mut keys = [0; 16];
 possiblyrandom::getpossiblyrandom(&mut keys);

Expand All@@ -83,7 +97,8 @@ mod hashbrown_tables {
 k0 = u64::from_le_bytes(k0_bytes);
 k1 = u64::from_le_bytes(k1_bytes);
 }
 #[cfg(any(fuzzing, not(feature = "possiblyrandom")))] {
 #[cfg(any(fuzzing, not(feature = "possiblyrandom")))]
 {
 k0 = 0;
 k1 = 0;
 }
Expand All@@ -92,7 +107,9 @@ mod hashbrown_tables {
 }

 impl Default for RandomState {
 fn default() -> RandomState { RandomState::new() }
 fn default() -> RandomState {
 RandomState::new()
 }
 }

 impl BuildHasher for RandomState {
Expand All@@ -103,8 +120,8 @@ mod hashbrown_tables {
 }
	}

	pub use hasher::*;
	use super::*;
	pub use hasher::*;

	/// The HashMap type used in LDK.
	pub type HashMap<K, V> = hashbrown::HashMap<K, V, RandomState>;
Expand All@@ -123,7 +140,13 @@ mod hashbrown_tables {
	pub fn hash_map_with_capacity<K, V>(cap: usize) -> HashMap<K, V> {
 HashMap::with_capacity_and_hasher(cap, RandomState::new())
	}
	pub(crate) fn hash_map_from_iter<K: core::hash::Hash + Eq, V, I: IntoIterator<Item=(K, V)>>(iter: I) -> HashMap<K, V> {
	pub(crate) fn hash_map_from_iter<
 K: core::hash::Hash + Eq,
 V,
 I: IntoIterator<Item = (K, V)>,
	>(
 iter: I,
	) -> HashMap<K, V> {
 let iter = iter.into_iter();
 let min_size = iter.size_hint().0;
 let mut res = HashMap::with_capacity_and_hasher(min_size, RandomState::new());
Expand All@@ -137,7 +160,9 @@ mod hashbrown_tables {
	pub(crate) fn hash_set_with_capacity<K>(cap: usize) -> HashSet<K> {
 HashSet::with_capacity_and_hasher(cap, RandomState::new())
	}
	pub(crate) fn hash_set_from_iter<K: core::hash::Hash + Eq, I: IntoIterator<Item=K>>(iter: I) -> HashSet<K> {
	pub(crate) fn hash_set_from_iter<K: core::hash::Hash + Eq, I: IntoIterator<Item = K>>(
 iter: I,
	) -> HashSet<K> {
 let iter = iter.into_iter();
 let min_size = iter.size_hint().0;
 let mut res = HashSet::with_capacity_and_hasher(min_size, RandomState::new());
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
`rustfmt`: Fix CI by running `rustfmt` on `util/hash_tables.rs` by tnull · Pull Request #2919 · lightningdevkit/rust-lightning · GitHub
Skip to content
rustfmt: Fix CI by running rustfmt on util/hash_tables.rs#2919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 1 commit into

from

Mar 4, 2024
 Merged

rustfmt: Fix CI by running rustfmt on util/hash_tables.rs#2919
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


51 changes: 38 additions & 13 deletions
lightning/src/util/hash_tables.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,31 +15,43 @@ extern crate possiblyrandom;

#[cfg(not(feature = "hashbrown"))]
mod std_hashtables {
	pub use std::collections::HashMap;
	pub use std::collections::hash_map::RandomState;
	pub use std::collections::HashMap;

	pub(crate) use std::collections::{HashSet, hash_map};
	pub(crate) use std::collections::{hash_map, HashSet};

	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>;

	/// Builds a new [`HashMap`].
	pub fn new_hash_map<K, V>() -> HashMap<K, V> { HashMap::new() }
	pub fn new_hash_map<K, V>() -> HashMap<K, V> {
 HashMap::new()
	}
	/// Builds a new [`HashMap`] with the given capacity.
	pub fn hash_map_with_capacity<K, V>(cap: usize) -> HashMap<K, V> {
 HashMap::with_capacity(cap)
	}
	pub(crate) fn hash_map_from_iter<K: core::hash::Hash + Eq, V, I: IntoIterator<Item=(K, V)>>(iter: I) -> HashMap<K, V> {
	pub(crate) fn hash_map_from_iter<
 K: core::hash::Hash + Eq,
 V,
 I: IntoIterator<Item = (K, V)>,
	>(
 iter: I,
	) -> HashMap<K, V> {
 HashMap::from_iter(iter)
	}

	pub(crate) fn new_hash_set<K>() -> HashSet<K> { HashSet::new() }
	pub(crate) fn new_hash_set<K>() -> HashSet<K> {
 HashSet::new()
	}
	pub(crate) fn hash_set_with_capacity<K>(cap: usize) -> HashSet<K> {
 HashSet::with_capacity(cap)
	}
	pub(crate) fn hash_set_from_iter<K: core::hash::Hash + Eq, I: IntoIterator<Item=K>>(iter: I) -> HashSet<K> {
	pub(crate) fn hash_set_from_iter<K: core::hash::Hash + Eq, I: IntoIterator<Item = K>>(
 iter: I,
	) -> HashSet<K> {
 HashSet::from_iter(iter)
	}
}
Expand All@@ -64,15 +76,17 @@ mod hashbrown_tables {
 /// A simple implementation of [`BuildHasher`] that uses `getrandom` to opportunistically
 /// randomize, if the platform supports it.
 pub struct RandomState {
 k0: u64, k1: u64,
 k0: u64,
 k1: u64,
 }

 impl RandomState {
 /// Constructs a new [`RandomState`] which may or may not be random, depending on the
 /// target platform.
 pub fn new() -> RandomState {
 let (k0, k1);
 #[cfg(all(not(fuzzing), feature = "possiblyrandom"))] {
 #[cfg(all(not(fuzzing), feature = "possiblyrandom"))]
 {
 let mut keys = [0; 16];
 possiblyrandom::getpossiblyrandom(&mut keys);

Expand All@@ -83,7 +97,8 @@ mod hashbrown_tables {
 k0 = u64::from_le_bytes(k0_bytes);
 k1 = u64::from_le_bytes(k1_bytes);
 }
 #[cfg(any(fuzzing, not(feature = "possiblyrandom")))] {
 #[cfg(any(fuzzing, not(feature = "possiblyrandom")))]
 {
 k0 = 0;
 k1 = 0;
 }
Expand All@@ -92,7 +107,9 @@ mod hashbrown_tables {
 }

 impl Default for RandomState {
 fn default() -> RandomState { RandomState::new() }
 fn default() -> RandomState {
 RandomState::new()
 }
 }

 impl BuildHasher for RandomState {
Expand All@@ -103,8 +120,8 @@ mod hashbrown_tables {
 }
	}

	pub use hasher::*;
	use super::*;
	pub use hasher::*;

	/// The HashMap type used in LDK.
	pub type HashMap<K, V> = hashbrown::HashMap<K, V, RandomState>;
Expand All@@ -123,7 +140,13 @@ mod hashbrown_tables {
	pub fn hash_map_with_capacity<K, V>(cap: usize) -> HashMap<K, V> {
 HashMap::with_capacity_and_hasher(cap, RandomState::new())
	}
	pub(crate) fn hash_map_from_iter<K: core::hash::Hash + Eq, V, I: IntoIterator<Item=(K, V)>>(iter: I) -> HashMap<K, V> {
	pub(crate) fn hash_map_from_iter<
 K: core::hash::Hash + Eq,
 V,
 I: IntoIterator<Item = (K, V)>,
	>(
 iter: I,
	) -> HashMap<K, V> {
 let iter = iter.into_iter();
 let min_size = iter.size_hint().0;
 let mut res = HashMap::with_capacity_and_hasher(min_size, RandomState::new());
Expand All@@ -137,7 +160,9 @@ mod hashbrown_tables {
	pub(crate) fn hash_set_with_capacity<K>(cap: usize) -> HashSet<K> {
 HashSet::with_capacity_and_hasher(cap, RandomState::new())
	}
	pub(crate) fn hash_set_from_iter<K: core::hash::Hash + Eq, I: IntoIterator<Item=K>>(iter: I) -> HashSet<K> {
	pub(crate) fn hash_set_from_iter<K: core::hash::Hash + Eq, I: IntoIterator<Item = K>>(
 iter: I,
	) -> HashSet<K> {
 let iter = iter.into_iter();
 let min_size = iter.size_hint().0;
 let mut res = HashSet::with_capacity_and_hasher(min_size, RandomState::new());
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
`rustfmt`: Fix CI by running `rustfmt` on `util/hash_tables.rs` by tnull · Pull Request #2919 · lightningdevkit/rust-lightning · GitHub
Skip to content
rustfmt: Fix CI by running rustfmt on util/hash_tables.rs#2919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 1 commit into

from

Mar 4, 2024
 Merged

rustfmt: Fix CI by running rustfmt on util/hash_tables.rs#2919
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


51 changes: 38 additions & 13 deletions
lightning/src/util/hash_tables.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,31 +15,43 @@ extern crate possiblyrandom;

#[cfg(not(feature = "hashbrown"))]
mod std_hashtables {
	pub use std::collections::HashMap;
	pub use std::collections::hash_map::RandomState;
	pub use std::collections::HashMap;

	pub(crate) use std::collections::{HashSet, hash_map};
	pub(crate) use std::collections::{hash_map, HashSet};

	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>;

	/// Builds a new [`HashMap`].
	pub fn new_hash_map<K, V>() -> HashMap<K, V> { HashMap::new() }
	pub fn new_hash_map<K, V>() -> HashMap<K, V> {
 HashMap::new()
	}
	/// Builds a new [`HashMap`] with the given capacity.
	pub fn hash_map_with_capacity<K, V>(cap: usize) -> HashMap<K, V> {
 HashMap::with_capacity(cap)
	}
	pub(crate) fn hash_map_from_iter<K: core::hash::Hash + Eq, V, I: IntoIterator<Item=(K, V)>>(iter: I) -> HashMap<K, V> {
	pub(crate) fn hash_map_from_iter<
 K: core::hash::Hash + Eq,
 V,
 I: IntoIterator<Item = (K, V)>,
	>(
 iter: I,
	) -> HashMap<K, V> {
 HashMap::from_iter(iter)
	}

	pub(crate) fn new_hash_set<K>() -> HashSet<K> { HashSet::new() }
	pub(crate) fn new_hash_set<K>() -> HashSet<K> {
 HashSet::new()
	}
	pub(crate) fn hash_set_with_capacity<K>(cap: usize) -> HashSet<K> {
 HashSet::with_capacity(cap)
	}
	pub(crate) fn hash_set_from_iter<K: core::hash::Hash + Eq, I: IntoIterator<Item=K>>(iter: I) -> HashSet<K> {
	pub(crate) fn hash_set_from_iter<K: core::hash::Hash + Eq, I: IntoIterator<Item = K>>(
 iter: I,
	) -> HashSet<K> {
 HashSet::from_iter(iter)
	}
}
Expand All@@ -64,15 +76,17 @@ mod hashbrown_tables {
 /// A simple implementation of [`BuildHasher`] that uses `getrandom` to opportunistically
 /// randomize, if the platform supports it.
 pub struct RandomState {
 k0: u64, k1: u64,
 k0: u64,
 k1: u64,
 }

 impl RandomState {
 /// Constructs a new [`RandomState`] which may or may not be random, depending on the
 /// target platform.
 pub fn new() -> RandomState {
 let (k0, k1);
 #[cfg(all(not(fuzzing), feature = "possiblyrandom"))] {
 #[cfg(all(not(fuzzing), feature = "possiblyrandom"))]
 {
 let mut keys = [0; 16];
 possiblyrandom::getpossiblyrandom(&mut keys);

Expand All@@ -83,7 +97,8 @@ mod hashbrown_tables {
 k0 = u64::from_le_bytes(k0_bytes);
 k1 = u64::from_le_bytes(k1_bytes);
 }
 #[cfg(any(fuzzing, not(feature = "possiblyrandom")))] {
 #[cfg(any(fuzzing, not(feature = "possiblyrandom")))]
 {
 k0 = 0;
 k1 = 0;
 }
Expand All@@ -92,7 +107,9 @@ mod hashbrown_tables {
 }

 impl Default for RandomState {
 fn default() -> RandomState { RandomState::new() }
 fn default() -> RandomState {
 RandomState::new()
 }
 }

 impl BuildHasher for RandomState {
Expand All@@ -103,8 +120,8 @@ mod hashbrown_tables {
 }
	}

	pub use hasher::*;
	use super::*;
	pub use hasher::*;

	/// The HashMap type used in LDK.
	pub type HashMap<K, V> = hashbrown::HashMap<K, V, RandomState>;
Expand All@@ -123,7 +140,13 @@ mod hashbrown_tables {
	pub fn hash_map_with_capacity<K, V>(cap: usize) -> HashMap<K, V> {
 HashMap::with_capacity_and_hasher(cap, RandomState::new())
	}
	pub(crate) fn hash_map_from_iter<K: core::hash::Hash + Eq, V, I: IntoIterator<Item=(K, V)>>(iter: I) -> HashMap<K, V> {
	pub(crate) fn hash_map_from_iter<
 K: core::hash::Hash + Eq,
 V,
 I: IntoIterator<Item = (K, V)>,
	>(
 iter: I,
	) -> HashMap<K, V> {
 let iter = iter.into_iter();
 let min_size = iter.size_hint().0;
 let mut res = HashMap::with_capacity_and_hasher(min_size, RandomState::new());
Expand All@@ -137,7 +160,9 @@ mod hashbrown_tables {
	pub(crate) fn hash_set_with_capacity<K>(cap: usize) -> HashSet<K> {
 HashSet::with_capacity_and_hasher(cap, RandomState::new())
	}
	pub(crate) fn hash_set_from_iter<K: core::hash::Hash + Eq, I: IntoIterator<Item=K>>(iter: I) -> HashSet<K> {
	pub(crate) fn hash_set_from_iter<K: core::hash::Hash + Eq, I: IntoIterator<Item = K>>(
 iter: I,
	) -> HashSet<K> {
 let iter = iter.into_iter();
 let min_size = iter.size_hint().0;
 let mut res = HashSet::with_capacity_and_hasher(min_size, RandomState::new());
Expand Down