From 7bb83a33615c30f6fa9cda8880d5ff7953657d14 Mon Sep 17 00:00:00 2001 From: Jamey Sharp Date: Wed, 15 Feb 2023 17:59:20 -0800 Subject: [PATCH] checker: Use a couple of Rust idioms (#114) This should have no functional change, just makes the source slightly easier to read and reason about. --- src/checker.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/checker.rs b/src/checker.rs index 6fe8d42..e132a93 100644 --- a/src/checker.rs +++ b/src/checker.rs @@ -1001,8 +1001,7 @@ impl<'a, F: Function> Checker<'a, F> { queue_set.insert(block); } - while !queue.is_empty() { - let block = queue.pop().unwrap(); + while let Some(block) = queue.pop() { queue_set.remove(&block); let mut state = self.bb_in.get(&block).cloned().unwrap(); trace!("analyze: block {} has state {:?}", block.index(), state); @@ -1043,9 +1042,8 @@ impl<'a, F: Function> Checker<'a, F> { new_state ); self.bb_in.insert(succ, new_state); - if !queue_set.contains(&succ) { + if queue_set.insert(succ) { queue.push(succ); - queue_set.insert(succ); } } }