Skip to content

Commit f81358d

Browse files
committed
BTree: remove outdated traces of coercions
1 parent f4008fe commit f81358d

File tree

1 file changed

+7
-19
lines changed
  • library/alloc/src/collections/btree

1 file changed

+7
-19
lines changed

library/alloc/src/collections/btree/map.rs

+7-19
Original file line numberDiff line numberDiff line change
@@ -1271,7 +1271,7 @@ impl<'a, K: 'a, V: 'a> Iterator for Iter<'a, K, V> {
12711271
None
12721272
} else {
12731273
self.length -= 1;
1274-
unsafe { Some(self.range.next_unchecked()) }
1274+
Some(unsafe { self.range.next_unchecked() })
12751275
}
12761276
}
12771277

@@ -1302,7 +1302,7 @@ impl<'a, K: 'a, V: 'a> DoubleEndedIterator for Iter<'a, K, V> {
13021302
None
13031303
} else {
13041304
self.length -= 1;
1305-
unsafe { Some(self.range.next_back_unchecked()) }
1305+
Some(unsafe { self.range.next_back_unchecked() })
13061306
}
13071307
}
13081308
}
@@ -1340,8 +1340,7 @@ impl<'a, K: 'a, V: 'a> Iterator for IterMut<'a, K, V> {
13401340
None
13411341
} else {
13421342
self.length -= 1;
1343-
let (k, v) = unsafe { self.range.next_unchecked() };
1344-
Some((k, v)) // coerce k from `&mut K` to `&K`
1343+
Some(unsafe { self.range.next_unchecked() })
13451344
}
13461345
}
13471346

@@ -1369,8 +1368,7 @@ impl<'a, K: 'a, V: 'a> DoubleEndedIterator for IterMut<'a, K, V> {
13691368
None
13701369
} else {
13711370
self.length -= 1;
1372-
let (k, v) = unsafe { self.range.next_back_unchecked() };
1373-
Some((k, v)) // coerce k from `&mut K` to `&K`
1371+
Some(unsafe { self.range.next_back_unchecked() })
13741372
}
13751373
}
13761374
}
@@ -1692,7 +1690,7 @@ impl<'a, K, V> Iterator for Range<'a, K, V> {
16921690
type Item = (&'a K, &'a V);
16931691

16941692
fn next(&mut self) -> Option<(&'a K, &'a V)> {
1695-
if self.is_empty() { None } else { unsafe { Some(self.next_unchecked()) } }
1693+
if self.is_empty() { None } else { Some(unsafe { self.next_unchecked() }) }
16961694
}
16971695

16981696
fn last(mut self) -> Option<(&'a K, &'a V)> {
@@ -1856,12 +1854,7 @@ impl<'a, K, V> Iterator for RangeMut<'a, K, V> {
18561854
type Item = (&'a K, &'a mut V);
18571855

18581856
fn next(&mut self) -> Option<(&'a K, &'a mut V)> {
1859-
if self.is_empty() {
1860-
None
1861-
} else {
1862-
let (k, v) = unsafe { self.next_unchecked() };
1863-
Some((k, v)) // coerce k from `&mut K` to `&K`
1864-
}
1857+
if self.is_empty() { None } else { Some(unsafe { self.next_unchecked() }) }
18651858
}
18661859

18671860
fn last(mut self) -> Option<(&'a K, &'a mut V)> {
@@ -1899,12 +1892,7 @@ impl<'a, K, V> RangeMut<'a, K, V> {
18991892
#[stable(feature = "btree_range", since = "1.17.0")]
19001893
impl<'a, K, V> DoubleEndedIterator for RangeMut<'a, K, V> {
19011894
fn next_back(&mut self) -> Option<(&'a K, &'a mut V)> {
1902-
if self.is_empty() {
1903-
None
1904-
} else {
1905-
let (k, v) = unsafe { self.next_back_unchecked() };
1906-
Some((k, v)) // coerce k from `&mut K` to `&K`
1907-
}
1895+
if self.is_empty() { None } else { Some(unsafe { self.next_back_unchecked() }) }
19081896
}
19091897
}
19101898

0 commit comments

Comments
 (0)