Skip to content

Commit d9b6181

Browse files
committed
Remove explicit lifetimes
1 parent 4df4c0d commit d9b6181

File tree

1 file changed

+20
-20
lines changed
  • library/alloc/src/collections/binary_heap

1 file changed

+20
-20
lines changed

library/alloc/src/collections/binary_heap/mod.rs

+20-20
Original file line numberDiff line numberDiff line change
@@ -300,14 +300,14 @@ pub struct PeekMut<
300300
}
301301

302302
#[stable(feature = "collection_debug", since = "1.17.0")]
303-
impl<'a, T: Ord + fmt::Debug, A: Allocator + 'a> fmt::Debug for PeekMut<'a, T, A> {
303+
impl<T: Ord + fmt::Debug, A: Allocator> fmt::Debug for PeekMut<'_, T, A> {
304304
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
305305
f.debug_tuple("PeekMut").field(&self.heap.data[0]).finish()
306306
}
307307
}
308308

309309
#[stable(feature = "binary_heap_peek_mut", since = "1.12.0")]
310-
impl<'a, T: Ord, A: Allocator + 'a> Drop for PeekMut<'a, T, A> {
310+
impl<T: Ord, A: Allocator> Drop for PeekMut<'_, T, A> {
311311
fn drop(&mut self) {
312312
if let Some(original_len) = self.original_len {
313313
// SAFETY: That's how many elements were in the Vec at the time of
@@ -324,7 +324,7 @@ impl<'a, T: Ord, A: Allocator + 'a> Drop for PeekMut<'a, T, A> {
324324
}
325325

326326
#[stable(feature = "binary_heap_peek_mut", since = "1.12.0")]
327-
impl<'a, T: Ord, A: Allocator + 'a> Deref for PeekMut<'a, T, A> {
327+
impl<T: Ord, A: Allocator> Deref for PeekMut<'_, T, A> {
328328
type Target = T;
329329
fn deref(&self) -> &T {
330330
debug_assert!(!self.heap.is_empty());
@@ -334,7 +334,7 @@ impl<'a, T: Ord, A: Allocator + 'a> Deref for PeekMut<'a, T, A> {
334334
}
335335

336336
#[stable(feature = "binary_heap_peek_mut", since = "1.12.0")]
337-
impl<'a, T: Ord, A: Allocator + 'a> DerefMut for PeekMut<'a, T, A> {
337+
impl<T: Ord, A: Allocator> DerefMut for PeekMut<'_, T, A> {
338338
fn deref_mut(&mut self) -> &mut T {
339339
debug_assert!(!self.heap.is_empty());
340340

@@ -362,7 +362,7 @@ impl<'a, T: Ord, A: Allocator + 'a> DerefMut for PeekMut<'a, T, A> {
362362
}
363363
}
364364

365-
impl<'a, T: Ord, A: Allocator + 'a> PeekMut<'a, T, A> {
365+
impl<'a, T: Ord, A: Allocator> PeekMut<'a, T, A> {
366366
/// Removes the peeked value from the heap and returns it.
367367
#[stable(feature = "binary_heap_peek_mut_pop", since = "1.18.0")]
368368
pub fn pop(mut this: PeekMut<'a, T, A>) -> T {
@@ -415,7 +415,7 @@ struct RebuildOnDrop<
415415
rebuild_from: usize,
416416
}
417417

418-
impl<'a, T: Ord, A: Allocator> Drop for RebuildOnDrop<'a, T, A> {
418+
impl<T: Ord, A: Allocator> Drop for RebuildOnDrop<'_, T, A> {
419419
fn drop(&mut self) {
420420
self.heap.rebuild_tail(self.rebuild_from);
421421
}
@@ -1617,13 +1617,13 @@ unsafe impl<T: Ord, A: Allocator> TrustedLen for IntoIterSorted<T, A> {}
16171617
pub struct Drain<
16181618
'a,
16191619
T: 'a,
1620-
#[unstable(feature = "allocator_api", issue = "32838")] A: Allocator + 'a = Global,
1620+
#[unstable(feature = "allocator_api", issue = "32838")] A: Allocator = Global,
16211621
> {
16221622
iter: vec::Drain<'a, T, A>,
16231623
}
16241624

16251625
#[stable(feature = "drain", since = "1.6.0")]
1626-
impl<'a, T, A: Allocator + 'a> Iterator for Drain<'a, T, A> {
1626+
impl<T, A: Allocator> Iterator for Drain<'_, T, A> {
16271627
type Item = T;
16281628

16291629
#[inline]
@@ -1638,22 +1638,22 @@ impl<'a, T, A: Allocator + 'a> Iterator for Drain<'a, T, A> {
16381638
}
16391639

16401640
#[stable(feature = "drain", since = "1.6.0")]
1641-
impl<'a, T, A: Allocator + 'a> DoubleEndedIterator for Drain<'a, T, A> {
1641+
impl<T, A: Allocator> DoubleEndedIterator for Drain<'_, T, A> {
16421642
#[inline]
16431643
fn next_back(&mut self) -> Option<T> {
16441644
self.iter.next_back()
16451645
}
16461646
}
16471647

16481648
#[stable(feature = "drain", since = "1.6.0")]
1649-
impl<'a, T, A: Allocator + 'a> ExactSizeIterator for Drain<'a, T, A> {
1649+
impl<T, A: Allocator> ExactSizeIterator for Drain<'_, T, A> {
16501650
fn is_empty(&self) -> bool {
16511651
self.iter.is_empty()
16521652
}
16531653
}
16541654

16551655
#[stable(feature = "fused", since = "1.26.0")]
1656-
impl<'a, T, A: Allocator + 'a> FusedIterator for Drain<'a, T, A> {}
1656+
impl<T, A: Allocator> FusedIterator for Drain<'_, T, A> {}
16571657

16581658
/// A draining iterator over the elements of a `BinaryHeap`.
16591659
///
@@ -1666,18 +1666,18 @@ impl<'a, T, A: Allocator + 'a> FusedIterator for Drain<'a, T, A> {}
16661666
pub struct DrainSorted<
16671667
'a,
16681668
T: Ord,
1669-
#[unstable(feature = "allocator_api", issue = "32838")] A: Allocator + 'a = Global,
1669+
#[unstable(feature = "allocator_api", issue = "32838")] A: Allocator = Global,
16701670
> {
16711671
inner: &'a mut BinaryHeap<T, A>,
16721672
}
16731673

16741674
#[unstable(feature = "binary_heap_drain_sorted", issue = "59278")]
1675-
impl<'a, T: Ord, A: Allocator + 'a> Drop for DrainSorted<'a, T, A> {
1675+
impl<'a, T: Ord, A: Allocator> Drop for DrainSorted<'a, T, A> {
16761676
/// Removes heap elements in heap order.
16771677
fn drop(&mut self) {
1678-
struct DropGuard<'r, 'a, T: Ord, A: Allocator + 'a>(&'r mut DrainSorted<'a, T, A>);
1678+
struct DropGuard<'r, 'a, T: Ord, A: Allocator>(&'r mut DrainSorted<'a, T, A>);
16791679

1680-
impl<'r, 'a, T: Ord, A: Allocator + 'a> Drop for DropGuard<'r, 'a, T, A> {
1680+
impl<'r, 'a, T: Ord, A: Allocator> Drop for DropGuard<'r, 'a, T, A> {
16811681
fn drop(&mut self) {
16821682
while self.0.inner.pop().is_some() {}
16831683
}
@@ -1692,7 +1692,7 @@ impl<'a, T: Ord, A: Allocator + 'a> Drop for DrainSorted<'a, T, A> {
16921692
}
16931693

16941694
#[unstable(feature = "binary_heap_drain_sorted", issue = "59278")]
1695-
impl<'a, T: Ord, A: Allocator + 'a> Iterator for DrainSorted<'a, T, A> {
1695+
impl<T: Ord, A: Allocator> Iterator for DrainSorted<'_, T, A> {
16961696
type Item = T;
16971697

16981698
#[inline]
@@ -1708,13 +1708,13 @@ impl<'a, T: Ord, A: Allocator + 'a> Iterator for DrainSorted<'a, T, A> {
17081708
}
17091709

17101710
#[unstable(feature = "binary_heap_drain_sorted", issue = "59278")]
1711-
impl<'a, T: Ord, A: Allocator + 'a> ExactSizeIterator for DrainSorted<'a, T, A> {}
1711+
impl<T: Ord, A: Allocator> ExactSizeIterator for DrainSorted<'_, T, A> {}
17121712

17131713
#[unstable(feature = "binary_heap_drain_sorted", issue = "59278")]
1714-
impl<'a, T: Ord, A: Allocator + 'a> FusedIterator for DrainSorted<'a, T, A> {}
1714+
impl<T: Ord, A: Allocator> FusedIterator for DrainSorted<'_, T, A> {}
17151715

17161716
#[unstable(feature = "trusted_len", issue = "37572")]
1717-
unsafe impl<'a, T: Ord, A: Allocator + 'a> TrustedLen for DrainSorted<'a, T, A> {}
1717+
unsafe impl<T: Ord, A: Allocator> TrustedLen for DrainSorted<'_, T, A> {}
17181718

17191719
#[stable(feature = "binary_heap_extras_15", since = "1.5.0")]
17201720
impl<T: Ord, A: Allocator> From<Vec<T, A>> for BinaryHeap<T, A> {
@@ -1791,7 +1791,7 @@ impl<T, A: Allocator> IntoIterator for BinaryHeap<T, A> {
17911791
}
17921792

17931793
#[stable(feature = "rust1", since = "1.0.0")]
1794-
impl<'a, T, A: Allocator + 'a> IntoIterator for &'a BinaryHeap<T, A> {
1794+
impl<'a, T, A: Allocator> IntoIterator for &'a BinaryHeap<T, A> {
17951795
type Item = &'a T;
17961796
type IntoIter = Iter<'a, T>;
17971797

0 commit comments

Comments
 (0)