Skip to content

Commit 15db1fd

Browse files
authored
Fix some clippy::needless_lifetime lints (#2519)
1 parent 9064b4c commit 15db1fd

File tree

8 files changed

+25
-25
lines changed

8 files changed

+25
-25
lines changed

src/dir.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,15 +190,15 @@ fn next(dir: &mut Dir) -> Option<Result<Entry>> {
190190
#[derive(Debug, Eq, Hash, PartialEq)]
191191
pub struct Iter<'d>(&'d mut Dir);
192192

193-
impl<'d> Iterator for Iter<'d> {
193+
impl Iterator for Iter<'_> {
194194
type Item = Result<Entry>;
195195

196196
fn next(&mut self) -> Option<Self::Item> {
197197
next(self.0)
198198
}
199199
}
200200

201-
impl<'d> Drop for Iter<'d> {
201+
impl Drop for Iter<'_> {
202202
fn drop(&mut self) {
203203
unsafe { libc::rewinddir((self.0).0.as_ptr()) }
204204
}

src/mount/bsd_without_apple.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ impl<'a> Nmount<'a> {
387387
}
388388

389389
#[cfg(target_os = "freebsd")]
390-
impl<'a> Drop for Nmount<'a> {
390+
impl Drop for Nmount<'_> {
391391
fn drop(&mut self) {
392392
for (iov, is_owned) in self.iov.iter().zip(self.is_owned.iter()) {
393393
if *is_owned {

src/poll.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ impl<'fd> PollFd<'fd> {
9696
}
9797
}
9898

99-
impl<'fd> AsFd for PollFd<'fd> {
99+
impl AsFd for PollFd<'_> {
100100
fn as_fd(&self) -> BorrowedFd<'_> {
101101
// Safety:
102102
//

src/sys/aio.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ impl<'a> AioCb<'a> {
193193
}
194194
}
195195

196-
impl<'a> Debug for AioCb<'a> {
196+
impl Debug for AioCb<'_> {
197197
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
198198
fmt.debug_struct("AioCb")
199199
.field("aiocb", &self.aiocb.0)
@@ -202,7 +202,7 @@ impl<'a> Debug for AioCb<'a> {
202202
}
203203
}
204204

205-
impl<'a> Drop for AioCb<'a> {
205+
impl Drop for AioCb<'_> {
206206
/// If the `AioCb` has no remaining state in the kernel, just drop it.
207207
/// Otherwise, dropping constitutes a resource leak, which is an error
208208
fn drop(&mut self) {
@@ -499,7 +499,7 @@ impl<'a> Aio for AioFsync<'a> {
499499

500500
// AioFsync does not need AsMut, since it can't be used with lio_listio
501501

502-
impl<'a> AsRef<libc::aiocb> for AioFsync<'a> {
502+
impl AsRef<libc::aiocb> for AioFsync<'_> {
503503
fn as_ref(&self) -> &libc::aiocb {
504504
&self.aiocb.aiocb.0
505505
}
@@ -609,13 +609,13 @@ impl<'a> Aio for AioRead<'a> {
609609
aio_methods!(aio_read);
610610
}
611611

612-
impl<'a> AsMut<libc::aiocb> for AioRead<'a> {
612+
impl AsMut<libc::aiocb> for AioRead<'_> {
613613
fn as_mut(&mut self) -> &mut libc::aiocb {
614614
&mut self.aiocb.aiocb.0
615615
}
616616
}
617617

618-
impl<'a> AsRef<libc::aiocb> for AioRead<'a> {
618+
impl AsRef<libc::aiocb> for AioRead<'_> {
619619
fn as_ref(&self) -> &libc::aiocb {
620620
&self.aiocb.aiocb.0
621621
}
@@ -732,14 +732,14 @@ impl<'a> Aio for AioReadv<'a> {
732732
}
733733

734734
#[cfg(target_os = "freebsd")]
735-
impl<'a> AsMut<libc::aiocb> for AioReadv<'a> {
735+
impl AsMut<libc::aiocb> for AioReadv<'_> {
736736
fn as_mut(&mut self) -> &mut libc::aiocb {
737737
&mut self.aiocb.aiocb.0
738738
}
739739
}
740740

741741
#[cfg(target_os = "freebsd")]
742-
impl<'a> AsRef<libc::aiocb> for AioReadv<'a> {
742+
impl AsRef<libc::aiocb> for AioReadv<'_> {
743743
fn as_ref(&self) -> &libc::aiocb {
744744
&self.aiocb.aiocb.0
745745
}
@@ -845,13 +845,13 @@ impl<'a> Aio for AioWrite<'a> {
845845
aio_methods!(aio_write);
846846
}
847847

848-
impl<'a> AsMut<libc::aiocb> for AioWrite<'a> {
848+
impl AsMut<libc::aiocb> for AioWrite<'_> {
849849
fn as_mut(&mut self) -> &mut libc::aiocb {
850850
&mut self.aiocb.aiocb.0
851851
}
852852
}
853853

854-
impl<'a> AsRef<libc::aiocb> for AioWrite<'a> {
854+
impl AsRef<libc::aiocb> for AioWrite<'_> {
855855
fn as_ref(&self) -> &libc::aiocb {
856856
&self.aiocb.aiocb.0
857857
}
@@ -965,14 +965,14 @@ impl<'a> Aio for AioWritev<'a> {
965965
}
966966

967967
#[cfg(target_os = "freebsd")]
968-
impl<'a> AsMut<libc::aiocb> for AioWritev<'a> {
968+
impl AsMut<libc::aiocb> for AioWritev<'_> {
969969
fn as_mut(&mut self) -> &mut libc::aiocb {
970970
&mut self.aiocb.aiocb.0
971971
}
972972
}
973973

974974
#[cfg(target_os = "freebsd")]
975-
impl<'a> AsRef<libc::aiocb> for AioWritev<'a> {
975+
impl AsRef<libc::aiocb> for AioWritev<'_> {
976976
fn as_ref(&self) -> &libc::aiocb {
977977
&self.aiocb.aiocb.0
978978
}

src/sys/select.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ impl<'fd> FdSet<'fd> {
115115
}
116116
}
117117

118-
impl<'fd> Default for FdSet<'fd> {
118+
impl Default for FdSet<'_> {
119119
fn default() -> Self {
120120
Self::new()
121121
}
@@ -128,7 +128,7 @@ pub struct Fds<'a, 'fd> {
128128
range: Range<usize>,
129129
}
130130

131-
impl<'a, 'fd> Iterator for Fds<'a, 'fd> {
131+
impl<'fd> Iterator for Fds<'_, 'fd> {
132132
type Item = BorrowedFd<'fd>;
133133

134134
fn next(&mut self) -> Option<Self::Item> {
@@ -148,7 +148,7 @@ impl<'a, 'fd> Iterator for Fds<'a, 'fd> {
148148
}
149149
}
150150

151-
impl<'a, 'fd> DoubleEndedIterator for Fds<'a, 'fd> {
151+
impl<'fd> DoubleEndedIterator for Fds<'_, 'fd> {
152152
#[inline]
153153
fn next_back(&mut self) -> Option<BorrowedFd<'fd>> {
154154
while let Some(i) = self.range.next_back() {
@@ -161,7 +161,7 @@ impl<'a, 'fd> DoubleEndedIterator for Fds<'a, 'fd> {
161161
}
162162
}
163163

164-
impl<'a, 'fd> FusedIterator for Fds<'a, 'fd> {}
164+
impl FusedIterator for Fds<'_, '_> {}
165165

166166
/// Monitors file descriptors for readiness
167167
///

src/sys/signal.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1412,7 +1412,7 @@ mod sigevent {
14121412
}
14131413
}
14141414

1415-
impl<'a> From<&'a libc::sigevent> for SigEvent {
1415+
impl From<&'_ libc::sigevent> for SigEvent {
14161416
#[cfg(target_os = "freebsd")]
14171417
fn from(sigevent: &libc::sigevent) -> Self {
14181418
// Safe because they're really the same structure. See

src/sys/socket/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ pub struct RecvMsg<'a, 's, S> {
599599
mhdr: msghdr,
600600
}
601601

602-
impl<'a, S> RecvMsg<'a, '_, S> {
602+
impl<S> RecvMsg<'_, '_, S> {
603603
/// Iterate over the valid control messages pointed to by this msghdr. If
604604
/// allocated space for CMSGs was too small it is not safe to iterate,
605605
/// instead return an `Error::ENOBUFS` error.
@@ -623,7 +623,7 @@ pub struct CmsgIterator<'a> {
623623
mhdr: &'a msghdr
624624
}
625625

626-
impl<'a> Iterator for CmsgIterator<'a> {
626+
impl Iterator for CmsgIterator<'_> {
627627
type Item = ControlMessageOwned;
628628

629629
fn next(&mut self) -> Option<ControlMessageOwned> {
@@ -1260,7 +1260,7 @@ pub enum ControlMessage<'a> {
12601260
#[derive(Clone, Debug, Eq, PartialEq)]
12611261
pub struct UnknownCmsg(cmsghdr, Vec<u8>);
12621262

1263-
impl<'a> ControlMessage<'a> {
1263+
impl ControlMessage<'_> {
12641264
/// The value of CMSG_SPACE on this message.
12651265
/// Safe because CMSG_SPACE is always safe
12661266
fn space(&self) -> usize {

test/test.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ struct DirRestore<'a> {
8585
_g: RwLockWriteGuard<'a, ()>,
8686
}
8787

88-
impl<'a> DirRestore<'a> {
88+
impl DirRestore<'_> {
8989
fn new() -> Self {
9090
let guard = crate::CWD_LOCK.write();
9191
DirRestore {
@@ -95,7 +95,7 @@ impl<'a> DirRestore<'a> {
9595
}
9696
}
9797

98-
impl<'a> Drop for DirRestore<'a> {
98+
impl Drop for DirRestore<'_> {
9999
fn drop(&mut self) {
100100
let r = chdir(&self.d);
101101
if std::thread::panicking() {

0 commit comments

Comments
 (0)