Avoid "hiding a lifetime" warnings

cli/src/host.rs

@@ -24,7 +24,7 @@ impl Env {
         }
     }
 
-    pub fn ensure_gui(&self) -> RefMut<GUI> {
+    pub fn ensure_gui(&self) -> RefMut<'_, GUI> {
         let mut gui = self.gui.borrow_mut();
         if gui.is_none() {
             *gui = Some(GUI::new(self.time.clone()).unwrap());

memory/src/boxmem.rs

@@ -22,7 +22,7 @@ impl BoxMem {
         self.0.len() as u32
     }
 
-    pub fn mem(&self) -> Mem {
+    pub fn mem(&self) -> Mem<'_> {
         Mem::from_slice(&self.0)
     }
 

memory/src/str16.rs

@@ -27,7 +27,7 @@ impl Str16 {
         })
     }
 
-    pub fn from_nul_term_ptr(mem: Mem, addr: u32) -> Option<&Self> {
+    pub fn from_nul_term_ptr(mem: Mem<'_>, addr: u32) -> Option<&Self> {
         if addr == 0 {
             return None;
         }

pe/src/imports.rs

@@ -98,7 +98,7 @@ impl<'a> std::fmt::Display for ImportSymbol<'a> {
 }
 
 impl ILTEntry {
-    pub fn as_import_symbol(self, image: &[u8]) -> ImportSymbol {
+    pub fn as_import_symbol(self, image: &[u8]) -> ImportSymbol<'_> {
         let entry = self.0;
         if entry & (1 << 31) != 0 {
             let ordinal = entry & 0xFFFF;

win32/derive/src/parse.rs

@@ -329,7 +329,7 @@ fn parse_vtable(name: &syn::Ident, item: &syn::ItemMacro) -> syn::Result<Option<
 }
 
 /// Parse a const looking for dllexport attributes.
-fn parse_const(item: &syn::ItemConst) -> syn::Result<Option<DllExportData>> {
+fn parse_const(item: &syn::ItemConst) -> syn::Result<Option<DllExportData<'_>>> {
     let Some(meta) = find_dllexport(&item.attrs)? else {
         return Ok(None);
     };

win32/dll/ddraw/src/ddraw.rs

@@ -221,7 +221,7 @@ impl Default for State {
 }
 
 #[inline]
-pub fn get_state(sys: &dyn System) -> RefMut<State> {
+pub fn get_state(sys: &dyn System) -> RefMut<'_, State> {
     generic_get_state::<State>(sys)
 }
 

win32/dll/dsound/src/lib.rs

@@ -45,7 +45,7 @@ impl State {
 }
 
 #[inline]
-pub fn get_state(sys: &dyn System) -> std::cell::RefMut<State> {
+pub fn get_state(sys: &dyn System) -> std::cell::RefMut<'_, State> {
     generic_get_state::<State>(sys)
 }
 

win32/dll/gdi32/src/state.rs

@@ -61,6 +61,6 @@ impl State {
 }
 
 #[inline]
-pub fn get_state(sys: &dyn System) -> std::cell::RefMut<State> {
+pub fn get_state(sys: &dyn System) -> std::cell::RefMut<'_, State> {
     generic_get_state::<State>(sys)
 }

win32/dll/kernel32/src/env.rs

@@ -14,7 +14,7 @@ impl Default for State {
 }
 
 #[inline]
-fn get_state(sys: &dyn System) -> std::cell::RefMut<State> {
+fn get_state(sys: &dyn System) -> std::cell::RefMut<'_, State> {
     generic_get_state::<State>(sys)
 }
 

win32/dll/kernel32/src/file/find.rs

@@ -13,7 +13,7 @@ pub type HFIND = HANDLE<HFINDT>;
 type State = Handles<HFIND, FindHandle>;
 
 #[inline]
-pub fn get_state(sys: &dyn System) -> std::cell::RefMut<State> {
+pub fn get_state(sys: &dyn System) -> std::cell::RefMut<'_, State> {
     generic_get_state::<State>(sys)
 }
 

win32/dll/kernel32/src/file/mod.rs

@@ -20,6 +20,6 @@ pub struct State {
 }
 
 #[inline]
-pub fn get_state(sys: &dyn System) -> std::cell::RefMut<State> {
+pub fn get_state(sys: &dyn System) -> std::cell::RefMut<'_, State> {
     generic_get_state::<State>(sys)
 }

win32/dll/kernel32/src/resource.rs

@@ -13,7 +13,7 @@ pub struct ResourceHandle(Range<u32>);
 type State = Handles<HRSRC, ResourceHandle>;
 
 #[inline]
-pub fn get_state(sys: &dyn System) -> std::cell::RefMut<State> {
+pub fn get_state(sys: &dyn System) -> std::cell::RefMut<'_, State> {
     generic_get_state::<State>(sys)
 }
 

win32/dll/kernel32/src/state.rs

@@ -65,7 +65,7 @@ impl State {
 }
 
 #[inline]
-pub fn get_state(sys: &dyn System) -> std::cell::RefMut<State> {
+pub fn get_state(sys: &dyn System) -> std::cell::RefMut<'_, State> {
     generic_get_state::<State>(sys)
 }
 

win32/dll/user32/src/state.rs

@@ -66,6 +66,6 @@ impl State {
 }
 
 #[inline]
-pub fn get_state(sys: &dyn System) -> std::cell::RefMut<State> {
+pub fn get_state(sys: &dyn System) -> std::cell::RefMut<'_, State> {
     generic_get_state::<State>(sys)
 }

win32/dll/winmm/src/lib.rs

@@ -39,6 +39,6 @@ pub struct State {
 }
 
 #[inline]
-pub fn get_state(sys: &dyn System) -> RefMut<State> {
+pub fn get_state(sys: &dyn System) -> RefMut<'_, State> {
     generic_get_state::<State>(sys)
 }

win32/src/machine.rs

@@ -54,7 +54,7 @@ where
 }
 
 impl System for Machine {
-    fn mem(&self) -> memory::Mem {
+    fn mem(&self) -> memory::Mem<'_> {
         self.mem()
     }
     fn memory(&self) -> &Memory {

win32/src/machine_emu.rs

@@ -40,7 +40,7 @@ impl MachineX<Emulator> {
         }
     }
 
-    pub fn mem(&self) -> Mem {
+    pub fn mem(&self) -> Mem<'_> {
         self.memory.mem()
     }
 

win32/system/src/memory.rs

@@ -198,7 +198,7 @@ impl Memory {
         self.imp.len()
     }
 
-    pub fn mem(&self) -> Mem {
+    pub fn mem(&self) -> Mem<'_> {
         self.imp.mem()
     }
 

win32/system/src/resource.rs

@@ -42,7 +42,7 @@ impl ResourceKey<String16> {
 }
 
 impl ResourceKey<&Str16> {
-    pub fn into_pe(&self) -> pe::ResourceName {
+    pub fn into_pe(&self) -> pe::ResourceName<'_> {
         match *self {
             ResourceKey::Id(id) => pe::ResourceName::Id(id),
             ResourceKey::Name(name) => pe::ResourceName::Name(name),

win32/system/src/system.rs

@@ -15,7 +15,7 @@ use win32_winapi::{ERROR, HANDLE, HMODULE};
 // TODO: I'd like to make the various Future-returning APIs to just return a future, but because we
 // make System a trait object we use the workaround from https://github.com/dtolnay/async-trait.
 pub trait System {
-    fn mem(&self) -> Mem;
+    fn mem(&self) -> Mem<'_>;
     fn memory(&self) -> &crate::memory::Memory;
     // TODO: this is ugly, and only needed in a few places, revisit.
     fn memory_mut(&mut self) -> &mut crate::memory::Memory;
@@ -84,7 +84,7 @@ pub trait System {
     ) -> &dyn std::any::Any;
 }
 
-pub fn generic_get_state<T>(sys: &dyn System) -> std::cell::RefMut<T>
+pub fn generic_get_state<T>(sys: &dyn System) -> std::cell::RefMut<'_, T>
 where
     T: 'static + Default,
 {