diff --git a/cli/src/host.rs b/cli/src/host.rs index 5d8ba8eb..5768b6a2 100644 --- a/cli/src/host.rs +++ b/cli/src/host.rs @@ -24,7 +24,7 @@ impl Env { } } - pub fn ensure_gui(&self) -> RefMut { + 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()); diff --git a/memory/src/boxmem.rs b/memory/src/boxmem.rs index 8cc13785..d9d759c6 100644 --- a/memory/src/boxmem.rs +++ b/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) } diff --git a/memory/src/str16.rs b/memory/src/str16.rs index 9da004ef..f4d6e3cb 100644 --- a/memory/src/str16.rs +++ b/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; } diff --git a/pe/src/imports.rs b/pe/src/imports.rs index 734d7687..56d4f2a5 100644 --- a/pe/src/imports.rs +++ b/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; diff --git a/win32/derive/src/parse.rs b/win32/derive/src/parse.rs index 4745427d..57df6688 100644 --- a/win32/derive/src/parse.rs +++ b/win32/derive/src/parse.rs @@ -329,7 +329,7 @@ fn parse_vtable(name: &syn::Ident, item: &syn::ItemMacro) -> syn::Result syn::Result> { +fn parse_const(item: &syn::ItemConst) -> syn::Result>> { let Some(meta) = find_dllexport(&item.attrs)? else { return Ok(None); }; diff --git a/win32/dll/ddraw/src/ddraw.rs b/win32/dll/ddraw/src/ddraw.rs index e1d15653..9adb9002 100644 --- a/win32/dll/ddraw/src/ddraw.rs +++ b/win32/dll/ddraw/src/ddraw.rs @@ -221,7 +221,7 @@ impl Default for State { } #[inline] -pub fn get_state(sys: &dyn System) -> RefMut { +pub fn get_state(sys: &dyn System) -> RefMut<'_, State> { generic_get_state::(sys) } diff --git a/win32/dll/dsound/src/lib.rs b/win32/dll/dsound/src/lib.rs index 855a2a06..5a77a6ce 100644 --- a/win32/dll/dsound/src/lib.rs +++ b/win32/dll/dsound/src/lib.rs @@ -45,7 +45,7 @@ impl State { } #[inline] -pub fn get_state(sys: &dyn System) -> std::cell::RefMut { +pub fn get_state(sys: &dyn System) -> std::cell::RefMut<'_, State> { generic_get_state::(sys) } diff --git a/win32/dll/gdi32/src/state.rs b/win32/dll/gdi32/src/state.rs index 03af2e9f..40fb5205 100644 --- a/win32/dll/gdi32/src/state.rs +++ b/win32/dll/gdi32/src/state.rs @@ -61,6 +61,6 @@ impl State { } #[inline] -pub fn get_state(sys: &dyn System) -> std::cell::RefMut { +pub fn get_state(sys: &dyn System) -> std::cell::RefMut<'_, State> { generic_get_state::(sys) } diff --git a/win32/dll/kernel32/src/env.rs b/win32/dll/kernel32/src/env.rs index 957dac3a..8b035706 100644 --- a/win32/dll/kernel32/src/env.rs +++ b/win32/dll/kernel32/src/env.rs @@ -14,7 +14,7 @@ impl Default for State { } #[inline] -fn get_state(sys: &dyn System) -> std::cell::RefMut { +fn get_state(sys: &dyn System) -> std::cell::RefMut<'_, State> { generic_get_state::(sys) } diff --git a/win32/dll/kernel32/src/file/find.rs b/win32/dll/kernel32/src/file/find.rs index 02262324..f4dd7490 100644 --- a/win32/dll/kernel32/src/file/find.rs +++ b/win32/dll/kernel32/src/file/find.rs @@ -13,7 +13,7 @@ pub type HFIND = HANDLE; type State = Handles; #[inline] -pub fn get_state(sys: &dyn System) -> std::cell::RefMut { +pub fn get_state(sys: &dyn System) -> std::cell::RefMut<'_, State> { generic_get_state::(sys) } diff --git a/win32/dll/kernel32/src/file/mod.rs b/win32/dll/kernel32/src/file/mod.rs index 3c082d2f..2ec5fbf8 100644 --- a/win32/dll/kernel32/src/file/mod.rs +++ b/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 { +pub fn get_state(sys: &dyn System) -> std::cell::RefMut<'_, State> { generic_get_state::(sys) } diff --git a/win32/dll/kernel32/src/resource.rs b/win32/dll/kernel32/src/resource.rs index 6f9481eb..3661ec4b 100644 --- a/win32/dll/kernel32/src/resource.rs +++ b/win32/dll/kernel32/src/resource.rs @@ -13,7 +13,7 @@ pub struct ResourceHandle(Range); type State = Handles; #[inline] -pub fn get_state(sys: &dyn System) -> std::cell::RefMut { +pub fn get_state(sys: &dyn System) -> std::cell::RefMut<'_, State> { generic_get_state::(sys) } diff --git a/win32/dll/kernel32/src/state.rs b/win32/dll/kernel32/src/state.rs index 764936f9..e353783b 100644 --- a/win32/dll/kernel32/src/state.rs +++ b/win32/dll/kernel32/src/state.rs @@ -65,7 +65,7 @@ impl State { } #[inline] -pub fn get_state(sys: &dyn System) -> std::cell::RefMut { +pub fn get_state(sys: &dyn System) -> std::cell::RefMut<'_, State> { generic_get_state::(sys) } diff --git a/win32/dll/user32/src/state.rs b/win32/dll/user32/src/state.rs index 85c9b469..4ef0e270 100644 --- a/win32/dll/user32/src/state.rs +++ b/win32/dll/user32/src/state.rs @@ -66,6 +66,6 @@ impl State { } #[inline] -pub fn get_state(sys: &dyn System) -> std::cell::RefMut { +pub fn get_state(sys: &dyn System) -> std::cell::RefMut<'_, State> { generic_get_state::(sys) } diff --git a/win32/dll/winmm/src/lib.rs b/win32/dll/winmm/src/lib.rs index 85702ef6..8f7fb808 100644 --- a/win32/dll/winmm/src/lib.rs +++ b/win32/dll/winmm/src/lib.rs @@ -39,6 +39,6 @@ pub struct State { } #[inline] -pub fn get_state(sys: &dyn System) -> RefMut { +pub fn get_state(sys: &dyn System) -> RefMut<'_, State> { generic_get_state::(sys) } diff --git a/win32/src/machine.rs b/win32/src/machine.rs index ed9f03d1..c93f3205 100644 --- a/win32/src/machine.rs +++ b/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 { diff --git a/win32/src/machine_emu.rs b/win32/src/machine_emu.rs index 3710a993..bf0aae81 100644 --- a/win32/src/machine_emu.rs +++ b/win32/src/machine_emu.rs @@ -40,7 +40,7 @@ impl MachineX { } } - pub fn mem(&self) -> Mem { + pub fn mem(&self) -> Mem<'_> { self.memory.mem() } diff --git a/win32/system/src/memory.rs b/win32/system/src/memory.rs index b39ea82a..44bb233c 100644 --- a/win32/system/src/memory.rs +++ b/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() } diff --git a/win32/system/src/resource.rs b/win32/system/src/resource.rs index b8f79842..e643b0a5 100644 --- a/win32/system/src/resource.rs +++ b/win32/system/src/resource.rs @@ -42,7 +42,7 @@ impl ResourceKey { } 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), diff --git a/win32/system/src/system.rs b/win32/system/src/system.rs index eb2ad3ea..fc48175f 100644 --- a/win32/system/src/system.rs +++ b/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(sys: &dyn System) -> std::cell::RefMut +pub fn generic_get_state(sys: &dyn System) -> std::cell::RefMut<'_, T> where T: 'static + Default, {