Skip to content

Rework all inlining attribute labels with consistent decisions #36

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

Open
xacrimon wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Rework all inlining attribute labels with consistent decisions #36

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fd067e7
remove unecessary implementation of default for ser/de visitors + don…
xacrimon Apr 26, 2025
e0ff464
remove explicit inline encouragement via attributes on expensive/larg…
xacrimon Apr 26, 2025
ac17383
remove inline attribs on non hot or complex fns in linked_hash_map.rs
xacrimon Apr 26, 2025
ad8a7e1
revert changes applied in another pr
xacrimon Apr 26, 2025
87eb6ae
fix unintended change in <Drain as Drop>::drop
xacrimon Apr 26, 2025
f6e77fc
remove inlining attributes on slow, complex and branchy internal impl…
xacrimon Apr 26, 2025
44b3525
force inlining through hash wrapper as not inlining is always worse i…
xacrimon Apr 26, 2025
d488876
don't encourage inlining main entry lookup fn
xacrimon Apr 26, 2025
2a27294
do encourage inline-thru of hashing due to CPU branch prediction of t…
xacrimon Apr 26, 2025
7b9e82a
prevent inlining of LL initialization and node freeing
xacrimon Apr 26, 2025
cca037a
cargo fmt
xacrimon Apr 26, 2025
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
43 changes: 0 additions & 43 deletions src/linked_hash_set.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,12 @@ pub struct LinkedHashSet<T, S = DefaultHashBuilder> {
}

impl<T: Hash + Eq> LinkedHashSet<T, DefaultHashBuilder> {
#[inline]
Copy link
Copy Markdown
Owner

@djc djc Oct 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not obvious to me that this should be counted as expensive, large or uncommon, so I guess the commit message doesn't make much sense to me?

pub fn new() -> LinkedHashSet<T, DefaultHashBuilder> {
LinkedHashSet {
map: LinkedHashMap::new(),
}
}

#[inline]
pub fn with_capacity(capacity: usize) -> LinkedHashSet<T, DefaultHashBuilder> {
LinkedHashSet {
map: LinkedHashMap::with_capacity(capacity),
Expand All @@ -35,7 +33,6 @@ impl<T, S> LinkedHashSet<T, S> {
self.map.capacity()
}

#[inline]
pub fn iter(&self) -> Iter<'_, T> {
Iter {
iter: self.map.keys(),
Expand All @@ -52,19 +49,16 @@ impl<T, S> LinkedHashSet<T, S> {
self.map.is_empty()
}

#[inline]
pub fn drain(&mut self) -> Drain<T> {
Drain {
iter: self.map.drain(),
}
}

#[inline]
pub fn clear(&mut self) {
self.map.clear()
}

#[inline]
pub fn retain<F>(&mut self, mut f: F)
where
F: FnMut(&T) -> bool,
Expand All @@ -78,14 +72,12 @@ where
T: Eq + Hash,
S: BuildHasher,
{
#[inline]
pub fn with_hasher(hasher: S) -> LinkedHashSet<T, S> {
LinkedHashSet {
map: LinkedHashMap::with_hasher(hasher),
}
}

#[inline]
pub fn with_capacity_and_hasher(capacity: usize, hasher: S) -> LinkedHashSet<T, S> {
LinkedHashSet {
map: LinkedHashMap::with_capacity_and_hasher(capacity, hasher),
Expand All @@ -97,30 +89,25 @@ where
self.map.hasher()
}

#[inline]
pub fn reserve(&mut self, additional: usize) {
self.map.reserve(additional)
}

#[inline]
pub fn try_reserve(&mut self, additional: usize) -> Result<(), TryReserveError> {
self.map.try_reserve(additional)
}

#[inline]
pub fn shrink_to_fit(&mut self) {
self.map.shrink_to_fit()
}

#[inline]
pub fn difference<'a>(&'a self, other: &'a LinkedHashSet<T, S>) -> Difference<'a, T, S> {
Difference {
iter: self.iter(),
other,
}
}

#[inline]
pub fn symmetric_difference<'a>(
&'a self,
other: &'a LinkedHashSet<T, S>,
Expand All @@ -130,15 +117,13 @@ where
}
}

#[inline]
pub fn intersection<'a>(&'a self, other: &'a LinkedHashSet<T, S>) -> Intersection<'a, T, S> {
Intersection {
iter: self.iter(),
other,
}
}

#[inline]
pub fn union<'a>(&'a self, other: &'a LinkedHashSet<T, S>) -> Union<'a, T, S> {
Union {
iter: self.iter().chain(other.difference(self)),
Expand Down Expand Up @@ -186,17 +171,14 @@ where
.0
}

#[inline]
pub fn is_disjoint(&self, other: &LinkedHashSet<T, S>) -> bool {
self.iter().all(|v| !other.contains(v))
}

#[inline]
pub fn is_subset(&self, other: &LinkedHashSet<T, S>) -> bool {
self.iter().all(|v| other.contains(v))
}

#[inline]
pub fn is_superset(&self, other: &LinkedHashSet<T, S>) -> bool {
other.is_subset(self)
}
Expand Down Expand Up @@ -297,7 +279,6 @@ where
}
}

#[inline]
pub fn retain_with_order<F>(&mut self, mut f: F)
where
F: FnMut(&T) -> bool,
Expand All @@ -307,7 +288,6 @@ where
}

impl<T: Hash + Eq + Clone, S: BuildHasher + Clone> Clone for LinkedHashSet<T, S> {
#[inline]
fn clone(&self) -> Self {
let map = self.map.clone();
Self { map }
Expand All @@ -319,7 +299,6 @@ where
T: Eq + Hash,
S: BuildHasher,
{
#[inline]
fn eq(&self, other: &Self) -> bool {
self.len() == other.len() && self.iter().eq(other)
}
Expand All @@ -330,7 +309,6 @@ where
T: Eq + Hash,
S: BuildHasher,
{
#[inline]
fn hash<H: Hasher>(&self, state: &mut H) {
for e in self {
e.hash(state);
Expand All @@ -349,7 +327,6 @@ impl<T, S> fmt::Debug for LinkedHashSet<T, S>
where
T: fmt::Debug,
{
#[inline]
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_set().entries(self.iter()).finish()
}
Expand All @@ -360,7 +337,6 @@ where
T: Eq + Hash,
S: BuildHasher + Default,
{
#[inline]
fn from_iter<I: IntoIterator<Item = T>>(iter: I) -> LinkedHashSet<T, S> {
let mut set = LinkedHashSet::with_hasher(Default::default());
set.extend(iter);
Expand All @@ -373,7 +349,6 @@ where
T: Eq + Hash,
S: BuildHasher,
{
#[inline]
fn extend<I: IntoIterator<Item = T>>(&mut self, iter: I) {
self.map.extend(iter.into_iter().map(|k| (k, ())));
}
Expand All @@ -384,7 +359,6 @@ where
T: 'a + Eq + Hash + Copy,
S: BuildHasher,
{
#[inline]
fn extend<I: IntoIterator<Item = &'a T>>(&mut self, iter: I) {
self.extend(iter.into_iter().cloned());
}
Expand All @@ -394,7 +368,6 @@ impl<T, S> Default for LinkedHashSet<T, S>
where
S: Default,
{
#[inline]
fn default() -> LinkedHashSet<T, S> {
LinkedHashSet {
map: LinkedHashMap::default(),
Expand All @@ -409,7 +382,6 @@ where
{
type Output = LinkedHashSet<T, S>;

#[inline]
fn bitor(self, rhs: &LinkedHashSet<T, S>) -> LinkedHashSet<T, S> {
self.union(rhs).cloned().collect()
}
Expand All @@ -422,7 +394,6 @@ where
{
type Output = LinkedHashSet<T, S>;

#[inline]
fn bitand(self, rhs: &LinkedHashSet<T, S>) -> LinkedHashSet<T, S> {
self.intersection(rhs).cloned().collect()
}
Expand All @@ -435,7 +406,6 @@ where
{
type Output = LinkedHashSet<T, S>;

#[inline]
fn bitxor(self, rhs: &LinkedHashSet<T, S>) -> LinkedHashSet<T, S> {
self.symmetric_difference(rhs).cloned().collect()
}
Expand All @@ -448,7 +418,6 @@ where
{
type Output = LinkedHashSet<T, S>;

#[inline]
fn sub(self, rhs: &LinkedHashSet<T, S>) -> LinkedHashSet<T, S> {
self.difference(rhs).cloned().collect()
}
Expand Down Expand Up @@ -488,7 +457,6 @@ impl<'a, T, S> IntoIterator for &'a LinkedHashSet<T, S> {
type Item = &'a T;
type IntoIter = Iter<'a, T>;

#[inline]
fn into_iter(self) -> Iter<'a, T> {
self.iter()
}
Expand All @@ -498,7 +466,6 @@ impl<T, S> IntoIterator for LinkedHashSet<T, S> {
type Item = T;
type IntoIter = IntoIter<T>;

#[inline]
fn into_iter(self) -> IntoIter<T> {
IntoIter {
iter: self.map.into_iter(),
Expand All @@ -507,7 +474,6 @@ impl<T, S> IntoIterator for LinkedHashSet<T, S> {
}

impl<'a, K> Clone for Iter<'a, K> {
#[inline]
fn clone(&self) -> Iter<'a, K> {
Iter {
iter: self.iter.clone(),
Expand Down Expand Up @@ -538,7 +504,6 @@ impl<'a, T> DoubleEndedIterator for Iter<'a, T> {
}

impl<K: fmt::Debug> fmt::Debug for Iter<'_, K> {
#[inline]
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_list().entries(self.clone()).finish()
}
Expand Down Expand Up @@ -591,7 +556,6 @@ impl<K> DoubleEndedIterator for Drain<'_, K> {
impl<K> ExactSizeIterator for Drain<'_, K> {}

impl<'a, T, S> Clone for Intersection<'a, T, S> {
#[inline]
fn clone(&self) -> Intersection<'a, T, S> {
Intersection {
iter: self.iter.clone(),
Expand Down Expand Up @@ -633,14 +597,12 @@ where
T: fmt::Debug + Eq + Hash,
S: BuildHasher,
{
#[inline]
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_list().entries(self.clone()).finish()
}
}

impl<'a, T, S> Clone for Difference<'a, T, S> {
#[inline]
fn clone(&self) -> Difference<'a, T, S> {
Difference {
iter: self.iter.clone(),
Expand Down Expand Up @@ -682,14 +644,12 @@ where
T: fmt::Debug + Eq + Hash,
S: BuildHasher,
{
#[inline]
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_list().entries(self.clone()).finish()
}
}

impl<'a, T, S> Clone for SymmetricDifference<'a, T, S> {
#[inline]
fn clone(&self) -> SymmetricDifference<'a, T, S> {
SymmetricDifference {
iter: self.iter.clone(),
Expand Down Expand Up @@ -720,14 +680,12 @@ where
T: fmt::Debug + Eq + Hash,
S: BuildHasher,
{
#[inline]
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_list().entries(self.clone()).finish()
}
}

impl<'a, T, S> Clone for Union<'a, T, S> {
#[inline]
fn clone(&self) -> Union<'a, T, S> {
Union {
iter: self.iter.clone(),
Expand All @@ -740,7 +698,6 @@ where
T: fmt::Debug + Eq + Hash,
S: BuildHasher,
{
#[inline]
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_list().entries(self.clone()).finish()
}
Expand Down
Loading