chore: satisfy elided_named_lifetimes lint

gfx-rs · Nov 25, 2024 · 96c855b · 96c855b
1 parent 9a43938
commit 96c855b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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
@@ -403,15 +403,15 @@ impl Binder {
         &self.payloads[bind_range]
     }
 
-    pub(super) fn list_active<'a>(&'a self) -> impl Iterator<Item = &'a Arc<BindGroup>> + '_ {
+    pub(super) fn list_active<'a>(&'a self) -> impl Iterator<Item = &'a Arc<BindGroup>> + 'a {
         let payloads = &self.payloads;
         self.manager
             .list_active()
             .map(move |index| payloads[index].group.as_ref().unwrap())
     }
 
     #[cfg(feature = "indirect-validation")]
-    pub(super) fn list_valid<'a>(&'a self) -> impl Iterator<Item = (usize, &'a EntryPayload)> + '_ {
+    pub(super) fn list_valid<'a>(&'a self) -> impl Iterator<Item = (usize, &'a EntryPayload)> + 'a {
         self.payloads
             .iter()
             .take(self.manager.num_valid_entries())

diff --git 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
@@ -74,7 +74,7 @@ impl<I: Copy + Ord, T: Copy + PartialEq> RangedStates<I, T> {
     pub fn iter_filter<'a>(
         &'a self,
         range: &'a Range<I>,
-    ) -> impl Iterator<Item = (Range<I>, &T)> + 'a {
+    ) -> impl Iterator<Item = (Range<I>, &'a T)> + 'a {
         self.ranges
             .iter()
             .filter(move |&(inner, ..)| inner.end > range.start && inner.start < range.end)