From 3b6867f53a6718de80bbff4acb84ffd5aca8a8c8 Mon Sep 17 00:00:00 2001
From: Karol Herbst <kherbst@redhat.com>
Date: Tue, 23 Jul 2024 13:24:56 +0200
Subject: [PATCH] nak: fix clippy::if_same_then_else error

Fixes: 9321a785cf2 ("nak: Implement Foldable for OpShf")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30323>
---
 src/nouveau/compiler/nak/ir.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/nouveau/compiler/nak/ir.rs b/src/nouveau/compiler/nak/ir.rs
index 7e00da7106a..4eb754c9be9 100644
--- a/src/nouveau/compiler/nak/ir.rs
+++ b/src/nouveau/compiler/nak/ir.rs
@@ -3673,9 +3673,7 @@ impl Foldable for OpShf {
             }
         };
 
-        let dst = if sm.sm() < 70 && !self.right {
-            (shifted >> 32) as u32
-        } else if self.dst_high {
+        let dst = if (sm.sm() < 70 && !self.right) || self.dst_high {
             (shifted >> 32) as u32
         } else {
             shifted as u32