From a77f904530920737901701b1f2004c8b3d9096cb Mon Sep 17 00:00:00 2001
From: David Rosca <david.rosca@amd.com>
Date: Tue, 12 Aug 2025 17:47:46 +0200
Subject: [PATCH] rusticl/ptr: Fix hidden lifetime warning

error: hiding a lifetime that's elided elsewhere is confusing
   --> ../src/gallium/frontends/rusticl/util/ptr.rs:166:18
    |
166 |     pub fn entry(&mut self, ptr: P) -> Entry<P, T> {
    |                  ^^^^^^^^^             ----------- the same lifetime is hidden here
    |                  |
    |                  the lifetime is elided here

Reviewed-by: Karol Herbst <kherbst@redhat.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36747>
(cherry picked from commit 09dd2bc388c4a170da93828e779d330421dd28de)
---
 .pick_status.json                         | 2 +-
 src/gallium/frontends/rusticl/util/ptr.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 8e6cc4c1865..38691591d94 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3484,7 +3484,7 @@
         "description": "rusticl/ptr: Fix hidden lifetime warning",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/gallium/frontends/rusticl/util/ptr.rs b/src/gallium/frontends/rusticl/util/ptr.rs
index 4d2f24ff415..a74b4d87164 100644
--- a/src/gallium/frontends/rusticl/util/ptr.rs
+++ b/src/gallium/frontends/rusticl/util/ptr.rs
@@ -196,7 +196,7 @@ where
         self.ptrs.contains_key(&ptr)
     }
 
-    pub fn entry(&mut self, ptr: P) -> Entry<P, T> {
+    pub fn entry(&mut self, ptr: P) -> Entry<'_, P, T> {
         self.ptrs.entry(ptr)
     }