Skip to content

Commit d02b945

Browse files
xacrimonxacrimon
committed
v6.2.0
1 parent b983625 commit d02b945

11 files changed

Lines changed: 41 additions & 46 deletions

File tree

‎Cargo.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "dashmap"
3-
version = "6.1.0"
3+
version = "6.2.0"
44
authors = ["Acrimon <joel.wejdenstal@gmail.com>"]
55
edition = "2018"
66
rust-version = "1.65"

‎src/iter.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,13 @@ pub struct Iter<'a, K, V, S = RandomState, M = DashMap<K, V, S>> {
116116
marker: PhantomData<S>,
117117
}
118118

119-
impl<'i, K: Clone + Hash + Eq, V: Clone, S: Clone + BuildHasher> Clone for Iter<'i, K, V, S> {
119+
impl<K: Clone + Hash + Eq, V: Clone, S: Clone + BuildHasher> Clone for Iter<'_, K, V, S> {
120120
fn clone(&self) -> Self {
121121
Iter::new(self.map)
122122
}
123123
}
124124

125-
unsafe impl<'a, 'i, K, V, S, M> Send for Iter<'i, K, V, S, M>
125+
unsafe impl<'a, K, V, S, M> Send for Iter<'_, K, V, S, M>
126126
where
127127
K: 'a + Eq + Hash + Send,
128128
V: 'a + Send,
@@ -131,7 +131,7 @@ where
131131
{
132132
}
133133

134-
unsafe impl<'a, 'i, K, V, S, M> Sync for Iter<'i, K, V, S, M>
134+
unsafe impl<'a, K, V, S, M> Sync for Iter<'_, K, V, S, M>
135135
where
136136
K: 'a + Eq + Hash + Sync,
137137
V: 'a + Sync,
@@ -202,7 +202,7 @@ pub struct IterMut<'a, K, V, S = RandomState, M = DashMap<K, V, S>> {
202202
marker: PhantomData<S>,
203203
}
204204

205-
unsafe impl<'a, 'i, K, V, S, M> Send for IterMut<'i, K, V, S, M>
205+
unsafe impl<'a, K, V, S, M> Send for IterMut<'_, K, V, S, M>
206206
where
207207
K: 'a + Eq + Hash + Send,
208208
V: 'a + Send,
@@ -211,7 +211,7 @@ where
211211
{
212212
}
213213

214-
unsafe impl<'a, 'i, K, V, S, M> Sync for IterMut<'i, K, V, S, M>
214+
unsafe impl<'a, K, V, S, M> Sync for IterMut<'_, K, V, S, M>
215215
where
216216
K: 'a + Eq + Hash + Sync,
217217
V: 'a + Sync,

‎src/iter_set.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ pub struct Iter<'a, K, S, M> {
3838
inner: crate::iter::Iter<'a, K, (), S, M>,
3939
}
4040

41-
unsafe impl<'a, 'i, K, S, M> Send for Iter<'i, K, S, M>
41+
unsafe impl<'a, K, S, M> Send for Iter<'_, K, S, M>
4242
where
4343
K: 'a + Eq + Hash + Send,
4444
S: 'a + BuildHasher + Clone,
4545
M: Map<'a, K, (), S>,
4646
{
4747
}
4848

49-
unsafe impl<'a, 'i, K, S, M> Sync for Iter<'i, K, S, M>
49+
unsafe impl<'a, K, S, M> Sync for Iter<'_, K, S, M>
5050
where
5151
K: 'a + Eq + Hash + Sync,
5252
S: 'a + BuildHasher + Clone,

‎src/lib.rs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ where
120120
}
121121
}
122122

123-
impl<'a, K: 'a + Eq + Hash, V: 'a> DashMap<K, V, RandomState> {
123+
impl<K: Eq + Hash, V> DashMap<K, V, RandomState> {
124124
/// Creates a new DashMap with a capacity of 0.
125125
///
126126
/// # Examples
@@ -1208,10 +1208,7 @@ impl<'a, K: 'a + Eq + Hash, V: 'a, S: 'a + BuildHasher + Clone> Map<'a, K, V, S>
12081208

12091209
let idx = self.determine_shard(hash as usize);
12101210

1211-
let mut shard = match unsafe { self._try_yield_write_shard(idx) } {
1212-
Some(shard) => shard,
1213-
None => return None,
1214-
};
1211+
let mut shard = unsafe { self._try_yield_write_shard(idx) }?;
12151212

12161213
match shard.find_or_find_insert_slot(
12171214
hash,

‎src/mapref/entry.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ pub struct VacantEntry<'a, K, V> {
118118
slot: hashbrown::raw::InsertSlot,
119119
}
120120

121-
unsafe impl<'a, K: Eq + Hash + Sync, V: Sync> Send for VacantEntry<'a, K, V> {}
122-
unsafe impl<'a, K: Eq + Hash + Sync, V: Sync> Sync for VacantEntry<'a, K, V> {}
121+
unsafe impl<K: Eq + Hash + Sync, V: Sync> Send for VacantEntry<'_, K, V> {}
122+
unsafe impl<K: Eq + Hash + Sync, V: Sync> Sync for VacantEntry<'_, K, V> {}
123123

124124
impl<'a, K: Eq + Hash, V> VacantEntry<'a, K, V> {
125125
pub(crate) unsafe fn new(
@@ -181,8 +181,8 @@ pub struct OccupiedEntry<'a, K, V> {
181181
key: K,
182182
}
183183

184-
unsafe impl<'a, K: Eq + Hash + Sync, V: Sync> Send for OccupiedEntry<'a, K, V> {}
185-
unsafe impl<'a, K: Eq + Hash + Sync, V: Sync> Sync for OccupiedEntry<'a, K, V> {}
184+
unsafe impl<K: Eq + Hash + Sync, V: Sync> Send for OccupiedEntry<'_, K, V> {}
185+
unsafe impl<K: Eq + Hash + Sync, V: Sync> Sync for OccupiedEntry<'_, K, V> {}
186186

187187
impl<'a, K: Eq + Hash, V> OccupiedEntry<'a, K, V> {
188188
pub(crate) unsafe fn new(

‎src/mapref/multiple.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ pub struct RefMulti<'a, K, V> {
1010
v: *const V,
1111
}
1212

13-
unsafe impl<'a, K: Eq + Hash + Sync, V: Sync> Send for RefMulti<'a, K, V> {}
14-
unsafe impl<'a, K: Eq + Hash + Sync, V: Sync> Sync for RefMulti<'a, K, V> {}
13+
unsafe impl<K: Eq + Hash + Sync, V: Sync> Send for RefMulti<'_, K, V> {}
14+
unsafe impl<K: Eq + Hash + Sync, V: Sync> Sync for RefMulti<'_, K, V> {}
1515

1616
impl<'a, K: Eq + Hash, V> RefMulti<'a, K, V> {
1717
pub(crate) unsafe fn new(
@@ -39,7 +39,7 @@ impl<'a, K: Eq + Hash, V> RefMulti<'a, K, V> {
3939
}
4040
}
4141

42-
impl<'a, K: Eq + Hash, V> Deref for RefMulti<'a, K, V> {
42+
impl<K: Eq + Hash, V> Deref for RefMulti<'_, K, V> {
4343
type Target = V;
4444

4545
fn deref(&self) -> &V {
@@ -53,8 +53,8 @@ pub struct RefMutMulti<'a, K, V> {
5353
v: *mut V,
5454
}
5555

56-
unsafe impl<'a, K: Eq + Hash + Sync, V: Sync> Send for RefMutMulti<'a, K, V> {}
57-
unsafe impl<'a, K: Eq + Hash + Sync, V: Sync> Sync for RefMutMulti<'a, K, V> {}
56+
unsafe impl<K: Eq + Hash + Sync, V: Sync> Send for RefMutMulti<'_, K, V> {}
57+
unsafe impl<K: Eq + Hash + Sync, V: Sync> Sync for RefMutMulti<'_, K, V> {}
5858

5959
impl<'a, K: Eq + Hash, V> RefMutMulti<'a, K, V> {
6060
pub(crate) unsafe fn new(
@@ -90,15 +90,15 @@ impl<'a, K: Eq + Hash, V> RefMutMulti<'a, K, V> {
9090
}
9191
}
9292

93-
impl<'a, K: Eq + Hash, V> Deref for RefMutMulti<'a, K, V> {
93+
impl<K: Eq + Hash, V> Deref for RefMutMulti<'_, K, V> {
9494
type Target = V;
9595

9696
fn deref(&self) -> &V {
9797
self.value()
9898
}
9999
}
100100

101-
impl<'a, K: Eq + Hash, V> DerefMut for RefMutMulti<'a, K, V> {
101+
impl<K: Eq + Hash, V> DerefMut for RefMutMulti<'_, K, V> {
102102
fn deref_mut(&mut self) -> &mut V {
103103
self.value_mut()
104104
}

‎src/mapref/one.rs‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ pub struct Ref<'a, K, V> {
1010
v: *const V,
1111
}
1212

13-
unsafe impl<'a, K: Eq + Hash + Sync, V: Sync> Send for Ref<'a, K, V> {}
14-
unsafe impl<'a, K: Eq + Hash + Sync, V: Sync> Sync for Ref<'a, K, V> {}
13+
unsafe impl<K: Eq + Hash + Sync, V: Sync> Send for Ref<'_, K, V> {}
14+
unsafe impl<K: Eq + Hash + Sync, V: Sync> Sync for Ref<'_, K, V> {}
1515

1616
impl<'a, K: Eq + Hash, V> Ref<'a, K, V> {
1717
pub(crate) unsafe fn new(
@@ -65,7 +65,7 @@ impl<'a, K: Eq + Hash, V> Ref<'a, K, V> {
6565
}
6666
}
6767

68-
impl<'a, K: Eq + Hash + Debug, V: Debug> Debug for Ref<'a, K, V> {
68+
impl<K: Eq + Hash + Debug, V: Debug> Debug for Ref<'_, K, V> {
6969
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
7070
f.debug_struct("Ref")
7171
.field("k", &self.k)
@@ -74,7 +74,7 @@ impl<'a, K: Eq + Hash + Debug, V: Debug> Debug for Ref<'a, K, V> {
7474
}
7575
}
7676

77-
impl<'a, K: Eq + Hash, V> Deref for Ref<'a, K, V> {
77+
impl<K: Eq + Hash, V> Deref for Ref<'_, K, V> {
7878
type Target = V;
7979

8080
fn deref(&self) -> &V {
@@ -88,8 +88,8 @@ pub struct RefMut<'a, K, V> {
8888
v: *mut V,
8989
}
9090

91-
unsafe impl<'a, K: Eq + Hash + Sync, V: Sync> Send for RefMut<'a, K, V> {}
92-
unsafe impl<'a, K: Eq + Hash + Sync, V: Sync> Sync for RefMut<'a, K, V> {}
91+
unsafe impl<K: Eq + Hash + Sync, V: Sync> Send for RefMut<'_, K, V> {}
92+
unsafe impl<K: Eq + Hash + Sync, V: Sync> Sync for RefMut<'_, K, V> {}
9393

9494
impl<'a, K: Eq + Hash, V> RefMut<'a, K, V> {
9595
pub(crate) unsafe fn new(
@@ -153,7 +153,7 @@ impl<'a, K: Eq + Hash, V> RefMut<'a, K, V> {
153153
}
154154
}
155155

156-
impl<'a, K: Eq + Hash + Debug, V: Debug> Debug for RefMut<'a, K, V> {
156+
impl<K: Eq + Hash + Debug, V: Debug> Debug for RefMut<'_, K, V> {
157157
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
158158
f.debug_struct("RefMut")
159159
.field("k", &self.k)
@@ -162,15 +162,15 @@ impl<'a, K: Eq + Hash + Debug, V: Debug> Debug for RefMut<'a, K, V> {
162162
}
163163
}
164164

165-
impl<'a, K: Eq + Hash, V> Deref for RefMut<'a, K, V> {
165+
impl<K: Eq + Hash, V> Deref for RefMut<'_, K, V> {
166166
type Target = V;
167167

168168
fn deref(&self) -> &V {
169169
self.value()
170170
}
171171
}
172172

173-
impl<'a, K: Eq + Hash, V> DerefMut for RefMut<'a, K, V> {
173+
impl<K: Eq + Hash, V> DerefMut for RefMut<'_, K, V> {
174174
fn deref_mut(&mut self) -> &mut V {
175175
self.value_mut()
176176
}
@@ -223,7 +223,7 @@ impl<'a, K: Eq + Hash, V, T> MappedRef<'a, K, V, T> {
223223
}
224224
}
225225

226-
impl<'a, K: Eq + Hash + Debug, V, T: Debug> Debug for MappedRef<'a, K, V, T> {
226+
impl<K: Eq + Hash + Debug, V, T: Debug> Debug for MappedRef<'_, K, V, T> {
227227
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
228228
f.debug_struct("MappedRef")
229229
.field("k", &self.k)
@@ -232,23 +232,21 @@ impl<'a, K: Eq + Hash + Debug, V, T: Debug> Debug for MappedRef<'a, K, V, T> {
232232
}
233233
}
234234

235-
impl<'a, K: Eq + Hash, V, T> Deref for MappedRef<'a, K, V, T> {
235+
impl<K: Eq + Hash, V, T> Deref for MappedRef<'_, K, V, T> {
236236
type Target = T;
237237

238238
fn deref(&self) -> &T {
239239
self.value()
240240
}
241241
}
242242

243-
impl<'a, K: Eq + Hash, V, T: std::fmt::Display> std::fmt::Display for MappedRef<'a, K, V, T> {
243+
impl<K: Eq + Hash, V, T: std::fmt::Display> std::fmt::Display for MappedRef<'_, K, V, T> {
244244
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
245245
std::fmt::Display::fmt(self.value(), f)
246246
}
247247
}
248248

249-
impl<'a, K: Eq + Hash, V, T: AsRef<TDeref>, TDeref: ?Sized> AsRef<TDeref>
250-
for MappedRef<'a, K, V, T>
251-
{
249+
impl<K: Eq + Hash, V, T: AsRef<TDeref>, TDeref: ?Sized> AsRef<TDeref> for MappedRef<'_, K, V, T> {
252250
fn as_ref(&self) -> &TDeref {
253251
self.value().as_ref()
254252
}
@@ -310,7 +308,7 @@ impl<'a, K: Eq + Hash, V, T> MappedRefMut<'a, K, V, T> {
310308
}
311309
}
312310

313-
impl<'a, K: Eq + Hash + Debug, V, T: Debug> Debug for MappedRefMut<'a, K, V, T> {
311+
impl<K: Eq + Hash + Debug, V, T: Debug> Debug for MappedRefMut<'_, K, V, T> {
314312
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
315313
f.debug_struct("MappedRefMut")
316314
.field("k", &self.k)
@@ -319,15 +317,15 @@ impl<'a, K: Eq + Hash + Debug, V, T: Debug> Debug for MappedRefMut<'a, K, V, T>
319317
}
320318
}
321319

322-
impl<'a, K: Eq + Hash, V, T> Deref for MappedRefMut<'a, K, V, T> {
320+
impl<K: Eq + Hash, V, T> Deref for MappedRefMut<'_, K, V, T> {
323321
type Target = T;
324322

325323
fn deref(&self) -> &T {
326324
self.value()
327325
}
328326
}
329327

330-
impl<'a, K: Eq + Hash, V, T> DerefMut for MappedRefMut<'a, K, V, T> {
328+
impl<K: Eq + Hash, V, T> DerefMut for MappedRefMut<'_, K, V, T> {
331329
fn deref_mut(&mut self) -> &mut T {
332330
self.value_mut()
333331
}

‎src/set.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ where
5050
}
5151
}
5252

53-
impl<'a, K: 'a + Eq + Hash> DashSet<K, RandomState> {
53+
impl<K: Eq + Hash> DashSet<K, RandomState> {
5454
/// Creates a new DashSet with a capacity of 0.
5555
///
5656
/// # Examples

‎src/setref/multiple.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ impl<'a, K: Eq + Hash> RefMulti<'a, K> {
1616
}
1717
}
1818

19-
impl<'a, K: Eq + Hash> Deref for RefMulti<'a, K> {
19+
impl<K: Eq + Hash> Deref for RefMulti<'_, K> {
2020
type Target = K;
2121

2222
fn deref(&self) -> &K {

0 commit comments

Comments
 (0)