From e7a059794e2b68ed3fc5f9c9229d0b354ed46283 Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Wed, 24 Jan 2024 13:21:48 +0100 Subject: [PATCH] nak: fix clippy::manual_while_let_some warnings Part-of: --- src/nouveau/compiler/nak/assign_regs.rs | 3 +-- src/nouveau/compiler/nak/lower_par_copies.rs | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/nouveau/compiler/nak/assign_regs.rs b/src/nouveau/compiler/nak/assign_regs.rs index 50d728bda91..242ae46d2a5 100644 --- a/src/nouveau/compiler/nak/assign_regs.rs +++ b/src/nouveau/compiler/nak/assign_regs.rs @@ -712,8 +712,7 @@ fn instr_assign_regs_file( let mut vec_dsts_map_to_killed_srcs = true; let mut could_trivially_allocate = true; for vec_dst in vec_dsts.iter_mut().rev() { - while !killed_vecs.is_empty() { - let src = killed_vecs.pop().unwrap(); + while let Some(src) = killed_vecs.pop() { if src.comps() >= vec_dst.comps { vec_dst.killed = Some(src); break; diff --git a/src/nouveau/compiler/nak/lower_par_copies.rs b/src/nouveau/compiler/nak/lower_par_copies.rs index b62ffbde3a6..e45c85ab68d 100644 --- a/src/nouveau/compiler/nak/lower_par_copies.rs +++ b/src/nouveau/compiler/nak/lower_par_copies.rs @@ -143,8 +143,7 @@ fn lower_par_copy(pc: OpParCopy, sm: u8) -> MappedInstrs { ready.push(i); } } - while !ready.is_empty() { - let dst_idx = ready.pop().unwrap(); + while let Some(dst_idx) = ready.pop() { if let Some(src_idx) = graph.src(dst_idx) { let dst = *vals[dst_idx].as_reg().unwrap(); let src = vals[src_idx];