[clippy] clean up redundant lifetimes for Windows

Fix a few more redundant lifetimes that were missed in
https://crrev.comc/6195239

Change-Id: Ic664a1010866c6742b6cabfba78c41295645f33a
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/6266470
Reviewed-by: Noah Gold <[email protected]>
Commit-Queue: Daniel Verkamp <[email protected]>

Author: danielverkamp

base/src/sys/windows/async_wait_for_single_object.rs

@@ -88,7 +88,7 @@ where
     }
 }
 
-impl<'a, T> Future for WaitForHandle<'a, T>
+impl<T> Future for WaitForHandle<'_, T>
 where
     T: AsRawDescriptor,
 {
@@ -158,7 +158,7 @@ where
     }
 }
 
-impl<'a, T> Drop for WaitForHandle<'a, T>
+impl<T> Drop for WaitForHandle<'_, T>
 where
     T: AsRawDescriptor,
 {

base/src/sys/windows/mmap.rs

@@ -156,12 +156,12 @@ pub trait MemoryMappingBuilderWindows<'a> {
     /// descriptor MUST be a mapping handle. Files MUST use `MemoryMappingBuilder::from_file`
     /// instead.
     #[allow(clippy::wrong_self_convention)]
-    fn from_descriptor(self, descriptor: &'a dyn AsRawDescriptor) -> MemoryMappingBuilder;
+    fn from_descriptor(self, descriptor: &'a dyn AsRawDescriptor) -> MemoryMappingBuilder<'a>;
 }
 
 impl<'a> MemoryMappingBuilderWindows<'a> for MemoryMappingBuilder<'a> {
     /// See MemoryMappingBuilderWindows.
-    fn from_descriptor(mut self, descriptor: &'a dyn AsRawDescriptor) -> MemoryMappingBuilder {
+    fn from_descriptor(mut self, descriptor: &'a dyn AsRawDescriptor) -> MemoryMappingBuilder<'a> {
         self.descriptor = Some(descriptor);
         self
     }

base/src/sys/windows/multi_process_mutex.rs

@@ -93,7 +93,7 @@ pub struct MultiProcessMutexGuard<'a> {
     lock: &'a SafeDescriptor,
 }
 
-impl<'a> Drop for MultiProcessMutexGuard<'a> {
+impl Drop for MultiProcessMutexGuard<'_> {
     fn drop(&mut self) {
         // SAFETY: We own the descriptor and is expected to be valid.
         if unsafe { ReleaseMutex(self.lock.as_raw_descriptor()) } == 0 {

net_util/src/slirp/sys/windows/handler.rs

@@ -192,7 +192,7 @@ impl CallbackHandler for Handler {
         // The actual Timer is freed implicitly by the Box drop.
     }
 
-    fn get_timers<'a>(&'a self) -> Box<dyn Iterator<Item = &RawDescriptor> + 'a> {
+    fn get_timers(&self) -> Box<dyn Iterator<Item = &RawDescriptor> + '_> {
         Box::new(self.timer_callbacks.keys())
     }
 
@@ -377,7 +377,7 @@ struct EventSelectedSocket<'a> {
 }
 
 impl<'a> EventSelectedSocket<'a> {
-    fn new(socket: WSAPOLLFD, event: &'a Event) -> Result<EventSelectedSocket> {
+    fn new(socket: WSAPOLLFD, event: &'a Event) -> Result<EventSelectedSocket<'a>> {
         // SAFETY:
         // Safe because socket.fd exists, the event handle is guaranteed to exist, and we check the
         // return code below.
@@ -397,7 +397,7 @@ impl<'a> EventSelectedSocket<'a> {
     }
 }
 
-impl<'a> Drop for EventSelectedSocket<'a> {
+impl Drop for EventSelectedSocket<'_> {
     fn drop(&mut self) {
         // SAFETY:
         // Safe because socket.fd exists, the event handle is guaranteed to exist, and we check the

third_party/libslirp-rs/src/context.rs

@@ -126,7 +126,7 @@ pub trait CallbackHandler {
 
     /// Gets an iterator of timers (as raw descriptors) so they can be awaited with a suitable
     /// polling function as part of libslirp's main consumer loop.
-    fn get_timers<'a>(&'a self) -> Box<dyn Iterator<Item = &RawDescriptor> + 'a>;
+    fn get_timers(&self) -> Box<dyn Iterator<Item = &RawDescriptor> + '_>;
 
     /// Runs the handler function for a specific timer.
     fn execute_timer(&mut self, timer: RawDescriptor);
@@ -694,7 +694,7 @@ impl<H: CallbackHandler> Context<H> {
         }
     }
 
-    pub fn get_timers<'a>(&'a self) -> Box<dyn Iterator<Item = &RawDescriptor> + 'a> {
+    pub fn get_timers(&self) -> Box<dyn Iterator<Item = &RawDescriptor> + '_> {
         self.callback_handler.get_timers()
     }
 

win_audio/src/win_audio_impl/wave_format.rs

@@ -539,7 +539,7 @@ fn upload_metrics(details: WaveFormatDetailsMetric, event_type: AudioFormatEvent
 
 struct GuidWrapper<'a>(&'a GUID);
 
-impl<'a> From<GuidWrapper<'a>> for WaveFormatSubFormatMetric {
+impl From<GuidWrapper<'_>> for WaveFormatSubFormatMetric {
     fn from(guid: GuidWrapper) -> WaveFormatSubFormatMetric {
         let guid = guid.0;
         if IsEqualGUID(guid, &KSDATAFORMAT_SUBTYPE_ANALOG) {