From 725af5b50c0629eaef8e30fd7fef06bce5686214 Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Tue, 23 Jan 2024 17:01:15 +0100 Subject: [PATCH] nak/opt_out: fix comparison in try_combine_outs clippy complained it was comparing the same thing Fixes: 5b355ff25a7 ("nak: Fix opt_out") Part-of: (cherry picked from commit 0a414ecdf5b55bb5a1717693dbf0fbaba9867792) --- .pick_status.json | 2 +- src/nouveau/compiler/nak/opt_out.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 242d85e4ac5..4ab605b52cd 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -684,7 +684,7 @@ "description": "nak/opt_out: fix comparison in try_combine_outs", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "5b355ff25a769193cfe83af669e69d9e51f109ec", "notes": null diff --git a/src/nouveau/compiler/nak/opt_out.rs b/src/nouveau/compiler/nak/opt_out.rs index fd94e4d5ccd..559472c3119 100644 --- a/src/nouveau/compiler/nak/opt_out.rs +++ b/src/nouveau/compiler/nak/opt_out.rs @@ -24,7 +24,7 @@ fn try_combine_outs(emit: &mut Instr, cut: &Instr) -> bool { return false; } - if emit.stream != emit.stream { + if emit.stream != cut.stream { return false; }