From 81b0c68fb0287dfcb871ea910f8447fa355274aa Mon Sep 17 00:00:00 2001
From: Karol Herbst <kherbst@redhat.com>
Date: Mon, 29 Jul 2024 14:07:06 +0200
Subject: [PATCH] rusticl: fix clippy lint having bounds defined in multiple
 places

Fixes: 734352ddfb9 ("rusticl/program: some boilerplate code for SPIR-V support")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30410>
(cherry picked from commit 7a8b1dc6e56dc94f37700be8870651715b36b161)
---
 .pick_status.json                         | 2 +-
 src/gallium/frontends/rusticl/api/util.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index a02929fb187..71cd5687928 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -144,7 +144,7 @@
         "description": "rusticl: fix clippy lint having bounds defined in multiple places",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "734352ddfb91f14aab2dd43937d45a360044f5cf",
         "notes": null
diff --git a/src/gallium/frontends/rusticl/api/util.rs b/src/gallium/frontends/rusticl/api/util.rs
index 903457678ab..4a6d765f17c 100644
--- a/src/gallium/frontends/rusticl/api/util.rs
+++ b/src/gallium/frontends/rusticl/api/util.rs
@@ -224,9 +224,9 @@ where
     }
 }
 
-pub fn cl_prop<T: CLProp>(v: T) -> Vec<MaybeUninit<u8>>
+pub fn cl_prop<T>(v: T) -> Vec<MaybeUninit<u8>>
 where
-    T: Sized,
+    T: CLProp + Sized,
 {
     v.cl_vec()
 }