lints + build errors

Author: aneubeck

crates/hash-sorted-map/benchmarks/performance.rs

@@ -1,4 +1,5 @@
 use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
+use hash_sorted_map::HashSortedMap;
 use hash_sorted_map_benchmarks::{random_trigram_hashes, IdentityBuildHasher};
 
 fn trigrams() -> Vec<u32> {
@@ -108,7 +109,7 @@ fn bench_insert(c: &mut Criterion) {
 
     group.bench_function("HashSortedMap", |b| {
         b.iter_batched(
-            || hash_sorted_map::hash_sorted_map::HashSortedMap::with_capacity_and_hasher(
+            || HashSortedMap::with_capacity_and_hasher(
                 trigrams.len(),
                 IdentityBuildHasher::default(),
             ),
@@ -154,7 +155,7 @@ fn bench_reinsert(c: &mut Criterion) {
     group.bench_function("HashSortedMap", |b| {
         b.iter_batched(
             || {
-                let mut map = hash_sorted_map::hash_sorted_map::HashSortedMap::with_capacity_and_hasher(
+                let mut map = HashSortedMap::with_capacity_and_hasher(
                     trigrams.len(),
                     IdentityBuildHasher::default(),
                 );
@@ -198,7 +199,7 @@ fn bench_grow(c: &mut Criterion) {
 
     group.bench_function("HashSortedMap", |b| {
         b.iter_batched(
-            || hash_sorted_map::hash_sorted_map::HashSortedMap::with_capacity_and_hasher(
+            || HashSortedMap::with_capacity_and_hasher(
                 128,
                 IdentityBuildHasher::default(),
             ),
@@ -242,7 +243,7 @@ fn bench_count(c: &mut Criterion) {
 
     group.bench_function("HashSortedMap get_or_default", |b| {
         b.iter_batched(
-            || hash_sorted_map::hash_sorted_map::HashSortedMap::<u32, u32, _>::with_capacity_and_hasher(
+            || HashSortedMap::<u32, u32, _>::with_capacity_and_hasher(
                 trigrams.len(),
                 IdentityBuildHasher::default(),
             ),
@@ -258,7 +259,7 @@ fn bench_count(c: &mut Criterion) {
 
     group.bench_function("HashSortedMap entry().or_default()", |b| {
         b.iter_batched(
-            || hash_sorted_map::hash_sorted_map::HashSortedMap::<u32, u32, _>::with_capacity_and_hasher(
+            || HashSortedMap::<u32, u32, _>::with_capacity_and_hasher(
                 trigrams.len(),
                 IdentityBuildHasher::default(),
             ),

crates/hash-sorted-map/src/hash_sorted_map.rs

@@ -49,6 +49,12 @@ pub struct HashSortedMap<K, V, S = RandomState> {
     hash_builder: S,
 }
 
+impl<K: Hash + Eq, V> Default for HashSortedMap<K, V> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl<K: Hash + Eq, V> HashSortedMap<K, V> {
     pub fn new() -> Self {
         Self::with_capacity_and_hasher(0, RandomState::new())
@@ -97,6 +103,10 @@ impl<K, V, S> HashSortedMap<K, V, S> {
     pub fn len(&self) -> usize {
         self.len
     }
+
+    pub fn is_empty(&self) -> bool {
+        self.len == 0
+    }
 }
 
 impl<K: Hash + Eq, V, S: BuildHasher> HashSortedMap<K, V, S> {
@@ -533,12 +543,12 @@ impl<'a, K: Hash + Eq, V, S: BuildHasher> VacantEntry<'a, K, V, S> {
 /// capacity check.)
 #[cold]
 #[inline(never)]
-fn insert_after_grow<'a, K: Hash + Eq, V, S: BuildHasher>(
-    map: &'a mut HashSortedMap<K, V, S>,
+fn insert_after_grow<K: Hash + Eq, V, S: BuildHasher>(
+    map: &mut HashSortedMap<K, V, S>,
     hash: u64,
     key: K,
     value: V,
-) -> &'a mut V {
+) -> &mut V {
     map.grow();
     match map.find_or_insertion_slot(hash, &key) {
         FindResult::Vacant(Insertion::Empty { group, slot }) => {

crates/string-offsets/benchmarks/performance.rs

@@ -1,4 +1,5 @@
-use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion};
+use std::hint::black_box;
+use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
 use rand::{rng, RngExt};
 use string_offsets::{AllConfig, OnlyLines, StringOffsets};