Skip to content

impl FromIterator, silence some of clippy::pedantic #68

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
lun3x merged 1 commit into from
Jun 8, 2026
Merged

impl FromIterator, silence some of clippy::pedantic #68

Show file tree
Hide file tree
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
76 changes: 36 additions & 40 deletions multi_index_map/benches/performance.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use multi_index_map::MultiIndexMap;
#[derive(Hash, PartialEq, Eq, Clone, Debug)]
struct TestNonPrimitiveType(u32);

#[allow(clippy::struct_field_names)]
#[derive(MultiIndexMap, Debug, Clone)]
#[multi_index_derive(Clone, Debug)]
pub struct TestElementWithOnlyIndexedFields {
Expand All @@ -17,12 +18,12 @@ pub struct TestElementWithOnlyIndexedFields {
field_ordered_non_unique: u32,
}

const BENCH_SIZES: &[u32] = &[100u32, 1000u32, 10000u32, 100000u32];
const BENCH_SIZES: &[u32] = &[100u32, 1_000u32, 10_000u32, 100_000u32];

fn insert_benchmark(c: &mut Criterion) {
fn inner(c: &mut Criterion, n: u32) {
let mut map = black_box(MultiIndexTestElementWithOnlyIndexedFieldsMap::default());
c.bench_function(&format!("insert_bench_{}", n), |b| {
c.bench_function(&format!("insert_bench_{n}"), |b| {
b.iter(|| {
for i in 0..n {
map.insert(black_box(TestElementWithOnlyIndexedFields {
Expand All @@ -33,7 +34,7 @@ fn insert_benchmark(c: &mut Criterion) {
}));
map.clear();
}
})
});
});
}

Expand All @@ -53,7 +54,7 @@ fn delete_by_hashed_unique_key_benchmark(c: &mut Criterion) {
field_ordered_non_unique: i / 5,
}));
}
c.bench_function(&format!("delete_hashed_unique_key_bench_{}", n), |b| {
c.bench_function(&format!("delete_hashed_unique_key_bench_{n}"), |b| {
b.iter(|| {
let mut map_clone = black_box(map.clone());
for i in 0..n {
Expand All @@ -62,7 +63,7 @@ fn delete_by_hashed_unique_key_benchmark(c: &mut Criterion) {
.remove_by_field_hashed_unique(black_box(&TestNonPrimitiveType(i))),
);
}
})
});
});
}

Expand All @@ -82,15 +83,15 @@ fn delete_by_hashed_non_unique_key_benchmark(c: &mut Criterion) {
field_ordered_non_unique: i / 5,
}));
}
c.bench_function(&format!("delete_hashed_non_unique_key_bench_{}", n), |b| {
c.bench_function(&format!("delete_hashed_non_unique_key_bench_{n}"), |b| {
b.iter(|| {
let mut map_clone = black_box(map.clone());
for i in 0..10 {
black_box(map_clone.remove_by_field_hashed_non_unique(black_box(
&TestNonPrimitiveType(42 + i % 5),
)));
}
})
});
});
}

Expand All @@ -110,13 +111,13 @@ fn delete_by_ordered_unique_key_benchmark(c: &mut Criterion) {
field_ordered_non_unique: i / 5,
}));
}
c.bench_function(&format!("delete_ordered_unique_key_bench_{}", n), |b| {
c.bench_function(&format!("delete_ordered_unique_key_bench_{n}"), |b| {
b.iter(|| {
let mut map_clone = black_box(map.clone());
for i in 0..n {
black_box(map_clone.remove_by_field_ordered_unique(black_box(&i)));
}
})
});
});
}

Expand All @@ -136,13 +137,13 @@ fn delete_by_ordered_non_unique_key_benchmark(c: &mut Criterion) {
field_ordered_non_unique: i / 5,
}));
}
c.bench_function(&format!("delete_ordered_non_unique_key_bench_{}", n), |b| {
c.bench_function(&format!("delete_ordered_non_unique_key_bench_{n}"), |b| {
b.iter(|| {
let mut map_clone = black_box(map.clone());
for i in 0..n {
black_box(map_clone.remove_by_field_ordered_non_unique(black_box(&(i / 5))));
}
})
});
});
}

Expand All @@ -163,7 +164,7 @@ fn modify_hashed_unique_key_by_hashed_unique_key_benchmark(c: &mut Criterion) {
}));
}
c.bench_function(
&format!("modify_hashed_unique_key_by_hashed_unique_key_bench_{}", n),
&format!("modify_hashed_unique_key_by_hashed_unique_key_bench_{n}"),
|b| {
b.iter(|| {
let mut map_clone = black_box(map.clone());
Expand All @@ -176,7 +177,7 @@ fn modify_hashed_unique_key_by_hashed_unique_key_benchmark(c: &mut Criterion) {
},
));
}
})
});
},
);
}
Expand All @@ -199,8 +200,7 @@ fn modify_hashed_non_unique_key_by_hashed_unique_key_benchmark(c: &mut Criterion
}
c.bench_function(
&format!(
"modify_hashed_non_unique_key_by_hashed_unique_key_bench_{}",
n
"modify_hashed_non_unique_key_by_hashed_unique_key_bench_{n}"
),
|b| {
b.iter(|| {
Expand All @@ -215,7 +215,7 @@ fn modify_hashed_non_unique_key_by_hashed_unique_key_benchmark(c: &mut Criterion
},
));
}
})
});
},
);
}
Expand All @@ -237,7 +237,7 @@ fn modify_ordered_unique_key_by_hashed_unique_key_benchmark(c: &mut Criterion) {
}));
}
c.bench_function(
&format!("modify_ordered_unique_key_by_hashed_unique_key_bench_{}", n),
&format!("modify_ordered_unique_key_by_hashed_unique_key_bench_{n}"),
|b| {
b.iter(|| {
let mut map_clone = black_box(map.clone());
Expand All @@ -249,7 +249,7 @@ fn modify_ordered_unique_key_by_hashed_unique_key_benchmark(c: &mut Criterion) {
},
));
}
})
});
},
);
}
Expand All @@ -272,8 +272,7 @@ fn modify_ordered_non_unique_key_by_hashed_unique_key_benchmark(c: &mut Criterio
}
c.bench_function(
&format!(
"modify_ordered_non_unique_key_by_hashed_unique_key_bench_{}",
n
"modify_ordered_non_unique_key_by_hashed_unique_key_bench_{n}"
),
|b| {
b.iter(|| {
Expand All @@ -286,7 +285,7 @@ fn modify_ordered_non_unique_key_by_hashed_unique_key_benchmark(c: &mut Criterio
}),
));
}
})
});
},
);
}
Expand All @@ -308,7 +307,7 @@ fn modify_hashed_unique_key_by_ordered_unique_key_benchmark(c: &mut Criterion) {
}));
}
c.bench_function(
&format!("modify_hashed_unique_key_by_ordered_unique_key_bench_{}", n),
&format!("modify_hashed_unique_key_by_ordered_unique_key_bench_{n}"),
|b| {
b.iter(|| {
let mut map_clone = black_box(map.clone());
Expand All @@ -321,7 +320,7 @@ fn modify_hashed_unique_key_by_ordered_unique_key_benchmark(c: &mut Criterion) {
},
));
}
})
});
},
);
}
Expand All @@ -344,8 +343,7 @@ fn modify_hashed_non_unique_key_by_ordered_unique_key_benchmark(c: &mut Criterio
}
c.bench_function(
&format!(
"modify_hashed_non_unique_key_by_ordered_unique_key_bench_{}",
n
"modify_hashed_non_unique_key_by_ordered_unique_key_bench_{n}"
),
|b| {
b.iter(|| {
Expand All @@ -360,7 +358,7 @@ fn modify_hashed_non_unique_key_by_ordered_unique_key_benchmark(c: &mut Criterio
},
));
}
})
});
},
);
}
Expand All @@ -383,8 +381,7 @@ fn modify_ordered_unique_key_by_ordered_unique_key_benchmark(c: &mut Criterion)
}
c.bench_function(
&format!(
"modify_ordered_unique_key_by_ordered_unique_key_bench_{}",
n
"modify_ordered_unique_key_by_ordered_unique_key_bench_{n}"
),
|b| {
b.iter(|| {
Expand All @@ -397,7 +394,7 @@ fn modify_ordered_unique_key_by_ordered_unique_key_benchmark(c: &mut Criterion)
},
));
}
})
});
},
);
}
Expand All @@ -420,8 +417,7 @@ fn modify_ordered_non_unique_key_by_ordered_unique_key_benchmark(c: &mut Criteri
}
c.bench_function(
&format!(
"modify_ordered_non_unique_key_by_ordered_unique_key_bench_{}",
n
"modify_ordered_non_unique_key_by_ordered_unique_key_bench_{n}"
),
|b| {
b.iter(|| {
Expand All @@ -434,7 +430,7 @@ fn modify_ordered_non_unique_key_by_ordered_unique_key_benchmark(c: &mut Criteri
},
));
}
})
});
},
);
}
Expand All @@ -456,13 +452,13 @@ fn hashed_unique_key_iter_benchmark(c: &mut Criterion) {
}));
map.clear();
}
c.bench_function(&format!("hashed_unique_key_iter_bench_{}", n), |b| {
c.bench_function(&format!("hashed_unique_key_iter_bench_{n}"), |b| {
b.iter(|| {
let mut a = black_box(map.iter_by_field_hashed_unique());
for _ in 0..n {
black_box(a.next());
}
})
});
});
}

Expand All @@ -483,13 +479,13 @@ fn hashed_non_unique_key_iter_benchmark(c: &mut Criterion) {
}));
map.clear();
}
c.bench_function(&format!("hashed_non_unique_key_iter_bench_{}", n), |b| {
c.bench_function(&format!("hashed_non_unique_key_iter_bench_{n}"), |b| {
b.iter(|| {
let mut a = black_box(map.iter_by_field_hashed_non_unique());
for _ in 0..n {
black_box(a.next());
}
})
});
});
}

Expand All @@ -510,13 +506,13 @@ fn ordered_unique_key_iter_benchmark(c: &mut Criterion) {
}));
map.clear();
}
c.bench_function(&format!("ordered_unique_key_iter_bench_{}", n), |b| {
c.bench_function(&format!("ordered_unique_key_iter_bench_{n}"), |b| {
b.iter(|| {
let mut a = black_box(map.iter_by_field_ordered_unique());
for _ in 0..n {
black_box(a.next());
}
})
});
});
}

Expand All @@ -537,13 +533,13 @@ fn ordered_non_unique_key_iter_benchmark(c: &mut Criterion) {
}));
map.clear();
}
c.bench_function(&format!("ordered_non_unique_key_iter_bench_{}", n), |b| {
c.bench_function(&format!("ordered_non_unique_key_iter_bench_{n}"), |b| {
b.iter(|| {
let mut a = black_box(map.iter_by_field_ordered_non_unique());
for _ in 0..n {
black_box(a.next());
}
})
});
});
}

Expand Down
Loading
Loading