Fix new lifetime warnings

12 files changed, 28 insertions, 19 deletions

diff --git a/niri-config/src/lib.rs b/niri-config/src/lib.rs
index 88ebe842..613aad3a 100644
--- a/niri-config/src/lib.rs
+++ b/niri-config/src/lib.rs
@@ -157,7 +157,7 @@ pub struct Xkb {
 }
 
 impl Xkb {
-    pub fn to_xkb_config(&self) -> XkbConfig {
+    pub fn to_xkb_config(&self) -> XkbConfig<'_> {
         XkbConfig {
             rules: &self.rules,
             model: &self.model,
diff --git a/src/render_helpers/border.rs b/src/render_helpers/border.rs
index a645212a..c4fe3a54 100644
--- a/src/render_helpers/border.rs
+++ b/src/render_helpers/border.rs
@@ -286,7 +286,7 @@ impl RenderElement<GlesRenderer> for BorderRenderElement {
         RenderElement::<GlesRenderer>::draw(&self.inner, frame, src, dst, damage, opaque_regions)
     }
 
-    fn underlying_storage(&self, renderer: &mut GlesRenderer) -> Option<UnderlyingStorage> {
+    fn underlying_storage(&self, renderer: &mut GlesRenderer) -> Option<UnderlyingStorage<'_>> {
         self.inner.underlying_storage(renderer)
     }
 }
@@ -303,7 +303,10 @@ impl<'render> RenderElement<TtyRenderer<'render>> for BorderRenderElement {
         RenderElement::<TtyRenderer<'_>>::draw(&self.inner, frame, src, dst, damage, opaque_regions)
     }
 
-    fn underlying_storage(&self, renderer: &mut TtyRenderer<'render>) -> Option<UnderlyingStorage> {
+    fn underlying_storage(
+        &self,
+        renderer: &mut TtyRenderer<'render>,
+    ) -> Option<UnderlyingStorage<'_>> {
         self.inner.underlying_storage(renderer)
     }
 }
diff --git a/src/render_helpers/clipped_surface.rs b/src/render_helpers/clipped_surface.rs
index 805e1bf3..6cf83a4f 100644
--- a/src/render_helpers/clipped_surface.rs
+++ b/src/render_helpers/clipped_surface.rs
@@ -230,7 +230,7 @@ impl RenderElement<GlesRenderer> for ClippedSurfaceRenderElement<GlesRenderer> {
         Ok(())
     }
 
-    fn underlying_storage(&self, _renderer: &mut GlesRenderer) -> Option<UnderlyingStorage> {
+    fn underlying_storage(&self, _renderer: &mut GlesRenderer) -> Option<UnderlyingStorage<'_>> {
         // If scanout for things other than Wayland buffers is implemented, this will need to take
         // the target GPU into account.
         None
@@ -259,7 +259,7 @@ impl<'render> RenderElement<TtyRenderer<'render>>
     fn underlying_storage(
         &self,
         _renderer: &mut TtyRenderer<'render>,
-    ) -> Option<UnderlyingStorage> {
+    ) -> Option<UnderlyingStorage<'_>> {
         // If scanout for things other than Wayland buffers is implemented, this will need to take
         // the target GPU into account.
         None
diff --git a/src/render_helpers/mod.rs b/src/render_helpers/mod.rs
index 6128069f..11c92185 100644
--- a/src/render_helpers/mod.rs
+++ b/src/render_helpers/mod.rs
@@ -105,7 +105,7 @@ impl<E> IntoIterator for SplitElements<E> {
 }
 
 impl<E> SplitElements<E> {
-    pub fn iter(&self) -> std::iter::Chain<std::slice::Iter<E>, std::slice::Iter<E>> {
+    pub fn iter(&self) -> std::iter::Chain<std::slice::Iter<'_, E>, std::slice::Iter<'_, E>> {
         self.popups.iter().chain(&self.normal)
     }
 
diff --git a/src/render_helpers/offscreen.rs b/src/render_helpers/offscreen.rs
index 7798a481..dd2c6ccc 100644
--- a/src/render_helpers/offscreen.rs
+++ b/src/render_helpers/offscreen.rs
@@ -347,7 +347,7 @@ impl<'render> RenderElement<TtyRenderer<'render>> for OffscreenRenderElement {
     fn underlying_storage(
         &self,
         _renderer: &mut TtyRenderer<'render>,
-    ) -> Option<UnderlyingStorage> {
+    ) -> Option<UnderlyingStorage<'_>> {
         // If scanout for things other than Wayland buffers is implemented, this will need to take
         // the target GPU into account.
         None
diff --git a/src/render_helpers/primary_gpu_texture.rs b/src/render_helpers/primary_gpu_texture.rs
index 1d318582..85dbc5b1 100644
--- a/src/render_helpers/primary_gpu_texture.rs
+++ b/src/render_helpers/primary_gpu_texture.rs
@@ -67,7 +67,7 @@ impl RenderElement<GlesRenderer> for PrimaryGpuTextureRenderElement {
         Ok(())
     }
 
-    fn underlying_storage(&self, _renderer: &mut GlesRenderer) -> Option<UnderlyingStorage> {
+    fn underlying_storage(&self, _renderer: &mut GlesRenderer) -> Option<UnderlyingStorage<'_>> {
         // If scanout for things other than Wayland buffers is implemented, this will need to take
         // the target GPU into account.
         None
@@ -91,7 +91,7 @@ impl<'render> RenderElement<TtyRenderer<'render>> for PrimaryGpuTextureRenderEle
     fn underlying_storage(
         &self,
         _renderer: &mut TtyRenderer<'render>,
-    ) -> Option<UnderlyingStorage> {
+    ) -> Option<UnderlyingStorage<'_>> {
         // If scanout for things other than Wayland buffers is implemented, this will need to take
         // the target GPU into account.
         None
diff --git a/src/render_helpers/render_elements.rs b/src/render_helpers/render_elements.rs
index de526028..e030c29b 100644
--- a/src/render_helpers/render_elements.rs
+++ b/src/render_helpers/render_elements.rs
@@ -113,7 +113,7 @@ macro_rules! niri_render_elements {
                 }
             }
 
-            fn underlying_storage(&self, renderer: &mut smithay::backend::renderer::gles::GlesRenderer) -> Option<smithay::backend::renderer::element::UnderlyingStorage> {
+            fn underlying_storage(&self, renderer: &mut smithay::backend::renderer::gles::GlesRenderer) -> Option<smithay::backend::renderer::element::UnderlyingStorage<'_>> {
                 match self {
                     $($name::$variant(elem) => elem.underlying_storage(renderer)),+
                 }
@@ -141,7 +141,7 @@ macro_rules! niri_render_elements {
             fn underlying_storage(
                 &self,
                 renderer: &mut $crate::backend::tty::TtyRenderer<'render>,
-            ) -> Option<smithay::backend::renderer::element::UnderlyingStorage> {
+            ) -> Option<smithay::backend::renderer::element::UnderlyingStorage<'_>> {
                 match self {
                     $($name::$variant(elem) => elem.underlying_storage(renderer)),+
                 }
diff --git a/src/render_helpers/resize.rs b/src/render_helpers/resize.rs
index 4f03a74e..62a5fa08 100644
--- a/src/render_helpers/resize.rs
+++ b/src/render_helpers/resize.rs
@@ -174,7 +174,7 @@ impl RenderElement<GlesRenderer> for ResizeRenderElement {
         Ok(())
     }
 
-    fn underlying_storage(&self, renderer: &mut GlesRenderer) -> Option<UnderlyingStorage> {
+    fn underlying_storage(&self, renderer: &mut GlesRenderer) -> Option<UnderlyingStorage<'_>> {
         self.0.underlying_storage(renderer)
     }
 }
@@ -193,7 +193,10 @@ impl<'render> RenderElement<TtyRenderer<'render>> for ResizeRenderElement {
         Ok(())
     }
 
-    fn underlying_storage(&self, renderer: &mut TtyRenderer<'render>) -> Option<UnderlyingStorage> {
+    fn underlying_storage(
+        &self,
+        renderer: &mut TtyRenderer<'render>,
+    ) -> Option<UnderlyingStorage<'_>> {
         self.0.underlying_storage(renderer)
     }
 }
diff --git a/src/render_helpers/shader_element.rs b/src/render_helpers/shader_element.rs
index 04f5ab02..cae2c74a 100644
--- a/src/render_helpers/shader_element.rs
+++ b/src/render_helpers/shader_element.rs
@@ -509,7 +509,7 @@ impl RenderElement<GlesRenderer> for ShaderRenderElement {
         Ok(())
     }
 
-    fn underlying_storage(&self, _renderer: &mut GlesRenderer) -> Option<UnderlyingStorage> {
+    fn underlying_storage(&self, _renderer: &mut GlesRenderer) -> Option<UnderlyingStorage<'_>> {
         // If scanout for things other than Wayland buffers is implemented, this will need to take
         // the target GPU into account.
         None
@@ -535,7 +535,7 @@ impl<'render> RenderElement<TtyRenderer<'render>> for ShaderRenderElement {
     fn underlying_storage(
         &self,
         _renderer: &mut TtyRenderer<'render>,
-    ) -> Option<UnderlyingStorage> {
+    ) -> Option<UnderlyingStorage<'_>> {
         // If scanout for things other than Wayland buffers is implemented, this will need to take
         // the target GPU into account.
         None
diff --git a/src/render_helpers/shaders/mod.rs b/src/render_helpers/shaders/mod.rs
index f1d11739..2db00662 100644
--- a/src/render_helpers/shaders/mod.rs
+++ b/src/render_helpers/shaders/mod.rs
@@ -297,7 +297,7 @@ pub fn set_custom_open_program(renderer: &mut GlesRenderer, src: Option<&str>) {
     }
 }
 
-pub fn mat3_uniform(name: &str, mat: Mat3) -> Uniform {
+pub fn mat3_uniform(name: &str, mat: Mat3) -> Uniform<'_> {
     Uniform::new(
         name,
         UniformValue::Matrix3x3 {
diff --git a/src/render_helpers/shadow.rs b/src/render_helpers/shadow.rs
index 3fc623d0..ed4e0ea0 100644
--- a/src/render_helpers/shadow.rs
+++ b/src/render_helpers/shadow.rs
@@ -247,7 +247,7 @@ impl RenderElement<GlesRenderer> for ShadowRenderElement {
         RenderElement::<GlesRenderer>::draw(&self.inner, frame, src, dst, damage, opaque_regions)
     }
 
-    fn underlying_storage(&self, renderer: &mut GlesRenderer) -> Option<UnderlyingStorage> {
+    fn underlying_storage(&self, renderer: &mut GlesRenderer) -> Option<UnderlyingStorage<'_>> {
         self.inner.underlying_storage(renderer)
     }
 }
@@ -264,7 +264,10 @@ impl<'render> RenderElement<TtyRenderer<'render>> for ShadowRenderElement {
         RenderElement::<TtyRenderer<'_>>::draw(&self.inner, frame, src, dst, damage, opaque_regions)
     }
 
-    fn underlying_storage(&self, renderer: &mut TtyRenderer<'render>) -> Option<UnderlyingStorage> {
+    fn underlying_storage(
+        &self,
+        renderer: &mut TtyRenderer<'render>,
+    ) -> Option<UnderlyingStorage<'_>> {
         self.inner.underlying_storage(renderer)
     }
 }
diff --git a/src/window/mapped.rs b/src/window/mapped.rs
index ec7c67b8..0f39bef4 100644
--- a/src/window/mapped.rs
+++ b/src/window/mapped.rs
@@ -303,7 +303,7 @@ impl Mapped {
         self.credentials.as_ref()
     }
 
-    pub fn offscreen_data(&self) -> Ref<Option<OffscreenData>> {
+    pub fn offscreen_data(&self) -> Ref<'_, Option<OffscreenData>> {
         self.offscreen_data.borrow()
     }