From 0e6b24451df5c05aa5a4ed945ea6fdbecde8d733 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 28 Aug 2025 16:20:34 +0200 Subject: [PATCH] rusticl: Fix hidden lifetime warnings Fix the following warning, and others that are similar, as rustc suggests: warning: hiding a lifetime that's elided elsewhere is confusing --> ../src/gallium/frontends/rusticl/mesa/compiler/nir.rs:282:22 | 282 | pub fn variables(&mut self) -> ExecListIter { | ^^^^^^^^^ -------------------------- the same lifetime is hidden here | | | the lifetime is elided here = help: the same lifetime is referred to in inconsistent ways, making the signature confusing = note: `#[warn(mismatched_lifetime_syntaxes)]` on by default help: use `'_` for type paths | 282 | pub fn variables(&mut self) -> ExecListIter<'_, nir_variable> { | +++ Signed-off-by: Philipp Zabel Part-of: --- src/gallium/frontends/rusticl/core/device.rs | 14 +++++++------- src/gallium/frontends/rusticl/core/event.rs | 2 +- src/gallium/frontends/rusticl/core/kernel.rs | 2 +- src/gallium/frontends/rusticl/core/program.rs | 2 +- src/gallium/frontends/rusticl/core/queue.rs | 2 +- src/gallium/frontends/rusticl/mesa/compiler/nir.rs | 2 +- src/gallium/frontends/rusticl/mesa/pipe/context.rs | 10 +++++----- src/gallium/frontends/rusticl/mesa/pipe/query.rs | 2 +- src/gallium/frontends/rusticl/mesa/pipe/screen.rs | 2 +- .../frontends/rusticl/mesa/util/disk_cache.rs | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/gallium/frontends/rusticl/core/device.rs b/src/gallium/frontends/rusticl/core/device.rs index a21135748e3..3c85315d9bc 100644 --- a/src/gallium/frontends/rusticl/core/device.rs +++ b/src/gallium/frontends/rusticl/core/device.rs @@ -132,7 +132,7 @@ pub trait HelperContextWrapper { offset: i32, size: i32, rw: RWFlags, - ) -> Option; + ) -> Option>; fn create_compute_state(&self, nir: &NirShader, static_local_mem: u32) -> *mut c_void; fn delete_compute_state(&self, cso: *mut c_void); fn compute_state_info(&self, state: *mut c_void) -> pipe_compute_state_object_info; @@ -144,14 +144,14 @@ pub trait HelperContextWrapper { offset: i32, size: i32, rw: RWFlags, - ) -> Option; + ) -> Option>; fn map_texture_unsynchronized( &self, res: &PipeResource, bx: &pipe_box, rw: RWFlags, - ) -> Option; + ) -> Option>; fn is_create_fence_fd_supported(&self) -> bool; fn import_fence(&self, fence_fd: &FenceFd, fence_type: pipe_fd_type) -> CLResult; @@ -200,7 +200,7 @@ impl HelperContextWrapper for HelperContext<'_> { offset: i32, size: i32, rw: RWFlags, - ) -> Option { + ) -> Option> { self.lock.buffer_map(res, offset, size, rw) } @@ -226,7 +226,7 @@ impl HelperContextWrapper for HelperContext<'_> { offset: i32, size: i32, rw: RWFlags, - ) -> Option { + ) -> Option> { self.lock.buffer_map_flags( res, offset, @@ -240,7 +240,7 @@ impl HelperContextWrapper for HelperContext<'_> { res: &PipeResource, bx: &pipe_box, rw: RWFlags, - ) -> Option { + ) -> Option> { self.lock .texture_map_flags(res, bx, pipe_map_flags::PIPE_MAP_UNSYNCHRONIZED | rw.into()) } @@ -1122,7 +1122,7 @@ impl DeviceBase { }) } - fn reusable_ctx(&self) -> MutexGuard> { + fn reusable_ctx(&self) -> MutexGuard<'_, Vec> { self.reusable_ctx.lock().unwrap() } diff --git a/src/gallium/frontends/rusticl/core/event.rs b/src/gallium/frontends/rusticl/core/event.rs index 1c36c09f16a..ebc85c5e6a3 100644 --- a/src/gallium/frontends/rusticl/core/event.rs +++ b/src/gallium/frontends/rusticl/core/event.rs @@ -97,7 +97,7 @@ impl Event { }) } - fn state(&self) -> MutexGuard { + fn state(&self) -> MutexGuard<'_, EventMutState> { self.state.lock().unwrap() } diff --git a/src/gallium/frontends/rusticl/core/kernel.rs b/src/gallium/frontends/rusticl/core/kernel.rs index e25e6904e8c..8ebd6f928e3 100644 --- a/src/gallium/frontends/rusticl/core/kernel.rs +++ b/src/gallium/frontends/rusticl/core/kernel.rs @@ -1721,7 +1721,7 @@ impl Kernel { })) } - pub fn arg_values(&self) -> MutexGuard>> { + pub fn arg_values(&self) -> MutexGuard<'_, Vec>> { self.values.lock().unwrap() } diff --git a/src/gallium/frontends/rusticl/core/program.rs b/src/gallium/frontends/rusticl/core/program.rs index 1aba2a8956b..2684f105230 100644 --- a/src/gallium/frontends/rusticl/core/program.rs +++ b/src/gallium/frontends/rusticl/core/program.rs @@ -474,7 +474,7 @@ impl Program { }) } - pub fn build_info(&self) -> MutexGuard { + pub fn build_info(&self) -> MutexGuard<'_, ProgramBuild> { self.build.lock().unwrap() } diff --git a/src/gallium/frontends/rusticl/core/queue.rs b/src/gallium/frontends/rusticl/core/queue.rs index 8ee82cde1d8..103c555f9d8 100644 --- a/src/gallium/frontends/rusticl/core/queue.rs +++ b/src/gallium/frontends/rusticl/core/queue.rs @@ -234,7 +234,7 @@ impl SendableQueueContext { } /// The returned value can be used to execute operation on the wrapped context in a safe manner. - fn ctx(&self) -> QueueContext { + fn ctx(&self) -> QueueContext<'_> { QueueContext { ctx: &self.ctx, dev: self.dev, diff --git a/src/gallium/frontends/rusticl/mesa/compiler/nir.rs b/src/gallium/frontends/rusticl/mesa/compiler/nir.rs index ed97ee08ced..7cbc48726b9 100644 --- a/src/gallium/frontends/rusticl/mesa/compiler/nir.rs +++ b/src/gallium/frontends/rusticl/mesa/compiler/nir.rs @@ -279,7 +279,7 @@ impl NirShader { unsafe { nir_cleanup_functions(self.nir.as_ptr()) }; } - pub fn variables(&mut self) -> ExecListIter { + pub fn variables(&mut self) -> ExecListIter<'_, nir_variable> { ExecListIter::new( &mut unsafe { self.nir.as_mut() }.variables, offset_of!(nir_variable, node), diff --git a/src/gallium/frontends/rusticl/mesa/pipe/context.rs b/src/gallium/frontends/rusticl/mesa/pipe/context.rs index cca44ec03f4..90468305369 100644 --- a/src/gallium/frontends/rusticl/mesa/pipe/context.rs +++ b/src/gallium/frontends/rusticl/mesa/pipe/context.rs @@ -271,7 +271,7 @@ impl PipeContext { bx: &pipe_box, flags: pipe_map_flags, is_buffer: bool, - ) -> Option { + ) -> Option> { let mut out: *mut pipe_transfer = ptr::null_mut(); let ptr = unsafe { @@ -297,7 +297,7 @@ impl PipeContext { offset: i32, size: i32, flags: pipe_map_flags, - ) -> Option { + ) -> Option> { let b = pipe_box { x: offset, width: size, @@ -315,7 +315,7 @@ impl PipeContext { offset: i32, size: i32, rw: RWFlags, - ) -> Option { + ) -> Option> { self.buffer_map_flags(res, offset, size, rw.into()) } @@ -328,7 +328,7 @@ impl PipeContext { res: &PipeResource, bx: &pipe_box, flags: pipe_map_flags, - ) -> Option { + ) -> Option> { self.resource_map(res, bx, flags, false) } @@ -337,7 +337,7 @@ impl PipeContext { res: &PipeResource, bx: &pipe_box, rw: RWFlags, - ) -> Option { + ) -> Option> { self.texture_map_flags(res, bx, rw.into()) } diff --git a/src/gallium/frontends/rusticl/mesa/pipe/query.rs b/src/gallium/frontends/rusticl/mesa/pipe/query.rs index 0ae556297a3..701b5081491 100644 --- a/src/gallium/frontends/rusticl/mesa/pipe/query.rs +++ b/src/gallium/frontends/rusticl/mesa/pipe/query.rs @@ -28,7 +28,7 @@ where PipeQueryGen: QueryResultTrait, { // The external interface to create a new query - pub fn new(ctx: &PipeContext) -> Option::ResType>> { + pub fn new(ctx: &PipeContext) -> Option::ResType>> { PipeQuery::<::ResType>::new(ctx, Q) } } diff --git a/src/gallium/frontends/rusticl/mesa/pipe/screen.rs b/src/gallium/frontends/rusticl/mesa/pipe/screen.rs index c0facb499cb..1939b72c0a0 100644 --- a/src/gallium/frontends/rusticl/mesa/pipe/screen.rs +++ b/src/gallium/frontends/rusticl/mesa/pipe/screen.rs @@ -105,7 +105,7 @@ impl PipeScreen { ) } - pub fn alloc_vm(&self, start: NonZeroU64, size: NonZeroU64) -> Option { + pub fn alloc_vm(&self, start: NonZeroU64, size: NonZeroU64) -> Option> { let alloc = unsafe { self.screen().alloc_vm?(self.screen.as_ptr(), start.get(), size.get()) }; Some(ScreenVMAllocation { diff --git a/src/gallium/frontends/rusticl/mesa/util/disk_cache.rs b/src/gallium/frontends/rusticl/mesa/util/disk_cache.rs index 8bd44aa0102..1595c337379 100644 --- a/src/gallium/frontends/rusticl/mesa/util/disk_cache.rs +++ b/src/gallium/frontends/rusticl/mesa/util/disk_cache.rs @@ -38,7 +38,7 @@ impl DiskCacheBorrowed { } } - pub fn get(&self, key: &mut cache_key) -> Option { + pub fn get(&self, key: &mut cache_key) -> Option> { let mut size = 0; unsafe {