From 9acfd9847b0854fc4edbd982e808ed069ca9f8d3 Mon Sep 17 00:00:00 2001 From: Ethan Pailes Date: Tue, 8 Oct 2024 14:14:10 +0000 Subject: [PATCH] fix: new lifetime lints --- libshpool/src/daemon/pager.rs | 4 ++-- libshpool/src/test_hooks.rs | 2 +- libshpool/src/tty.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libshpool/src/daemon/pager.rs b/libshpool/src/daemon/pager.rs index 2d0f3a04..8f13f3b3 100644 --- a/libshpool/src/daemon/pager.rs +++ b/libshpool/src/daemon/pager.rs @@ -329,7 +329,7 @@ struct PagerProcGuard<'pager> { pager_exited: Arc, } -impl<'pager> std::ops::Drop for PagerProcGuard<'pager> { +impl std::ops::Drop for PagerProcGuard<'_> { fn drop(&mut self) { if self.pager_exited.load(Ordering::Relaxed) { // our work here is done @@ -342,7 +342,7 @@ impl<'pager> std::ops::Drop for PagerProcGuard<'pager> { } } -impl<'pager> PagerProcGuard<'pager> { +impl PagerProcGuard<'_> { fn kill(&self) -> anyhow::Result<()> { let pid = if let shpool_pty::fork::Fork::Parent(pid, _) = self.pager_proc { *pid diff --git a/libshpool/src/test_hooks.rs b/libshpool/src/test_hooks.rs index 271c6dfe..ece4623a 100644 --- a/libshpool/src/test_hooks.rs +++ b/libshpool/src/test_hooks.rs @@ -62,7 +62,7 @@ impl<'a> ScopedEvent<'a> { } } -impl<'a> std::ops::Drop for ScopedEvent<'a> { +impl std::ops::Drop for ScopedEvent<'_> { fn drop(&mut self) { emit(self.event); } diff --git a/libshpool/src/tty.rs b/libshpool/src/tty.rs index 8294a982..e7d67f4f 100644 --- a/libshpool/src/tty.rs +++ b/libshpool/src/tty.rs @@ -135,7 +135,7 @@ pub struct AttachFlagsGuard<'fd> { old: Option, } -impl<'fd> std::ops::Drop for AttachFlagsGuard<'fd> { +impl std::ops::Drop for AttachFlagsGuard<'_> { fn drop(&mut self) { if let Some(old) = &self.old { if let Err(e) = termios::tcsetattr(self.fd, SetArg::TCSANOW, old) {