mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mark lifetimes explicitly

Browse Source
This commit is contained in:
yanchith 2022-07-16 18:51:15 +02:00
parent a3122b8138
commit d48b281468
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
library/alloc/src/collections/binary_heap.rs
View File

@ -292,14 +292,14 @@ pub struct PeekMut<
} }
#[stable(feature = "collection_debug", since = "1.17.0")] #[stable(feature = "collection_debug", since = "1.17.0")]
impl<T: Ord + fmt::Debug, A: Allocator> fmt::Debug for PeekMut<'_, T, A> { impl<'a, T: Ord + fmt::Debug, A: Allocator + 'a> fmt::Debug for PeekMut<'a, T, A> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_tuple("PeekMut").field(&self.heap.data[0]).finish() f.debug_tuple("PeekMut").field(&self.heap.data[0]).finish()
} }
} }
#[stable(feature = "binary_heap_peek_mut", since = "1.12.0")] #[stable(feature = "binary_heap_peek_mut", since = "1.12.0")]
impl<T: Ord, A: Allocator> Drop for PeekMut<'_, T, A> { impl<'a, T: Ord, A: Allocator + 'a> Drop for PeekMut<'a, T, A> {
fn drop(&mut self) { fn drop(&mut self) {
if self.sift { if self.sift {
// SAFETY: PeekMut is only instantiated for non-empty heaps. // SAFETY: PeekMut is only instantiated for non-empty heaps.
@ -309,7 +309,7 @@ fn drop(&mut self) {
} }
#[stable(feature = "binary_heap_peek_mut", since = "1.12.0")] #[stable(feature = "binary_heap_peek_mut", since = "1.12.0")]
impl<T: Ord, A: Allocator> Deref for PeekMut<'_, T, A> { impl<'a, T: Ord, A: Allocator + 'a> Deref for PeekMut<'a, T, A> {
type Target = T; type Target = T;
fn deref(&self) -> &T { fn deref(&self) -> &T {
debug_assert!(!self.heap.is_empty()); debug_assert!(!self.heap.is_empty());
@ -319,7 +319,7 @@ fn deref(&self) -> &T {
} }
#[stable(feature = "binary_heap_peek_mut", since = "1.12.0")] #[stable(feature = "binary_heap_peek_mut", since = "1.12.0")]
impl<T: Ord, A: Allocator> DerefMut for PeekMut<'_, T, A> { impl<'a, T: Ord, A: Allocator + 'a> DerefMut for PeekMut<'a, T, A> {
fn deref_mut(&mut self) -> &mut T { fn deref_mut(&mut self) -> &mut T {
debug_assert!(!self.heap.is_empty()); debug_assert!(!self.heap.is_empty());
self.sift = true; self.sift = true;
@ -328,10 +328,10 @@ fn deref_mut(&mut self) -> &mut T {
} }
} }
impl<'a, T: Ord> PeekMut<'a, T> { impl<'a, T: Ord, A: Allocator + 'a> PeekMut<'a, T, A> {
/// Removes the peeked value from the heap and returns it. /// Removes the peeked value from the heap and returns it.
#[stable(feature = "binary_heap_peek_mut_pop", since = "1.18.0")] #[stable(feature = "binary_heap_peek_mut_pop", since = "1.18.0")]
pub fn pop(mut this: PeekMut<'a, T>) -> T { pub fn pop(mut this: PeekMut<'a, T, A>) -> T {
let value = this.heap.pop().unwrap(); let value = this.heap.pop().unwrap();
this.sift = false; this.sift = false;
value value
@ -1611,7 +1611,7 @@ fn drop(&mut self) {
} }
#[unstable(feature = "binary_heap_drain_sorted", issue = "59278")] #[unstable(feature = "binary_heap_drain_sorted", issue = "59278")]
impl<T: Ord, A: Allocator> Iterator for DrainSorted<'_, T, A> { impl<'a, T: Ord, A: Allocator + 'a> Iterator for DrainSorted<'a, T, A> {
type Item = T; type Item = T;
#[inline] #[inline]
@ -1627,13 +1627,13 @@ fn size_hint(&self) -> (usize, Option<usize>) {
} }
#[unstable(feature = "binary_heap_drain_sorted", issue = "59278")] #[unstable(feature = "binary_heap_drain_sorted", issue = "59278")]
impl<T: Ord, A: Allocator> ExactSizeIterator for DrainSorted<'_, T, A> {} impl<'a, T: Ord, A: Allocator + 'a> ExactSizeIterator for DrainSorted<'a, T, A> {}
#[unstable(feature = "binary_heap_drain_sorted", issue = "59278")] #[unstable(feature = "binary_heap_drain_sorted", issue = "59278")]
impl<T: Ord, A: Allocator> FusedIterator for DrainSorted<'_, T, A> {} impl<'a, T: Ord, A: Allocator + 'a> FusedIterator for DrainSorted<'a, T, A> {}
#[unstable(feature = "trusted_len", issue = "37572")] #[unstable(feature = "trusted_len", issue = "37572")]
unsafe impl<T: Ord, A: Allocator> TrustedLen for DrainSorted<'_, T, A> {} unsafe impl<'a, T: Ord, A: Allocator + 'a> TrustedLen for DrainSorted<'a, T, A> {}
#[stable(feature = "binary_heap_extras_15", since = "1.5.0")] #[stable(feature = "binary_heap_extras_15", since = "1.5.0")]
impl<T: Ord, A: Allocator> From<Vec<T, A>> for BinaryHeap<T, A> { impl<T: Ord, A: Allocator> From<Vec<T, A>> for BinaryHeap<T, A> {