diff --git a/naga/src/front/wgsl/lower/mod.rs b/naga/src/front/wgsl/lower/mod.rs index 111d4f18d9..5dcc3160a3 100644 --- a/naga/src/front/wgsl/lower/mod.rs +++ b/naga/src/front/wgsl/lower/mod.rs @@ -189,7 +189,7 @@ impl<'a, 'temp> StatementContext<'a, 'temp, '_> { &'t mut self, block: &'t mut crate::Block, emitter: &'t mut Emitter, - ) -> ExpressionContext<'a, 't, '_> + ) -> ExpressionContext<'a, 't, 't> where 'temp: 't, { @@ -215,7 +215,7 @@ impl<'a, 'temp> StatementContext<'a, 'temp, '_> { &'t mut self, block: &'t mut crate::Block, emitter: &'t mut Emitter, - ) -> ExpressionContext<'a, 't, '_> + ) -> ExpressionContext<'a, 't, 't> where 'temp: 't, { diff --git a/wgpu-core/src/binding_model.rs b/wgpu-core/src/binding_model.rs index 3620a1e1f6..b0d9b5f68c 100644 --- a/wgpu-core/src/binding_model.rs +++ b/wgpu-core/src/binding_model.rs @@ -928,7 +928,7 @@ impl BindGroup { pub(crate) fn try_raw<'a>( &'a self, guard: &'a SnatchGuard, - ) -> Result<&dyn hal::DynBindGroup, DestroyedResourceError> { + ) -> Result<&'a dyn hal::DynBindGroup, DestroyedResourceError> { // Clippy insist on writing it this way. The idea is to return None // if any of the raw buffer is not valid anymore. for buffer in &self.used_buffer_ranges { diff --git a/wgpu-core/src/command/bind.rs b/wgpu-core/src/command/bind.rs index 22831c7a81..2e1ffa030e 100644 --- a/wgpu-core/src/command/bind.rs +++ b/wgpu-core/src/command/bind.rs @@ -403,7 +403,7 @@ impl Binder { &self.payloads[bind_range] } - pub(super) fn list_active<'a>(&'a self) -> impl Iterator> + '_ { + pub(super) fn list_active<'a>(&'a self) -> impl Iterator> + 'a { let payloads = &self.payloads; self.manager .list_active() @@ -411,7 +411,7 @@ impl Binder { } #[cfg(feature = "indirect-validation")] - pub(super) fn list_valid<'a>(&'a self) -> impl Iterator + '_ { + pub(super) fn list_valid<'a>(&'a self) -> impl Iterator + 'a { self.payloads .iter() .take(self.manager.num_valid_entries()) diff --git a/wgpu-core/src/resource.rs b/wgpu-core/src/resource.rs index 764c5bafe4..055c254508 100644 --- a/wgpu-core/src/resource.rs +++ b/wgpu-core/src/resource.rs @@ -503,7 +503,7 @@ impl Buffer { pub(crate) fn try_raw<'a>( &'a self, guard: &'a SnatchGuard, - ) -> Result<&dyn hal::DynBuffer, DestroyedResourceError> { + ) -> Result<&'a dyn hal::DynBuffer, DestroyedResourceError> { self.raw .get(guard) .map(|raw| raw.as_ref()) @@ -2076,7 +2076,7 @@ impl Drop for Tlas { } impl AccelerationStructure for Tlas { - fn raw<'a>(&'a self, guard: &'a SnatchGuard) -> Option<&dyn hal::DynAccelerationStructure> { + fn raw<'a>(&'a self, guard: &'a SnatchGuard) -> Option<&'a dyn hal::DynAccelerationStructure> { Some(self.raw.get(guard)?.as_ref()) } } diff --git a/wgpu-core/src/track/range.rs b/wgpu-core/src/track/range.rs index 3961220c2c..ee67732787 100644 --- a/wgpu-core/src/track/range.rs +++ b/wgpu-core/src/track/range.rs @@ -74,7 +74,7 @@ impl RangedStates { pub fn iter_filter<'a>( &'a self, range: &'a Range, - ) -> impl Iterator, &T)> + 'a { + ) -> impl Iterator, &'a T)> + 'a { self.ranges .iter() .filter(move |&(inner, ..)| inner.end > range.start && inner.start < range.end)