From 404700637f32801ce219a159e446a8d7d76584ee Mon Sep 17 00:00:00 2001
From: Artem Agvanian <nartagva@amazon.com>
Date: Tue, 16 Jul 2024 16:10:11 -0700
Subject: [PATCH] Slightly less hacky way to satisfy borrow checker

---
 kani-compiler/src/kani_middle/reachability.rs  | 4 +---
 kani-compiler/src/kani_middle/transform/mod.rs | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/kani-compiler/src/kani_middle/reachability.rs b/kani-compiler/src/kani_middle/reachability.rs
index ec8ed2c5355b..d2c9d50515c4 100644
--- a/kani-compiler/src/kani_middle/reachability.rs
+++ b/kani-compiler/src/kani_middle/reachability.rs
@@ -193,9 +193,7 @@ impl<'tcx, 'a> MonoItemsCollector<'tcx, 'a> {
                 self.call_graph.add_edges(to_visit, &next_items);
 
                 self.queue.extend(next_items.into_iter().filter_map(
-                    |CollectedItem { item, .. }| {
-     (!self.collected.contains(&item)).then_some(item)
-                    },
+                    |CollectedItem { item, .. }| (!self.collected.contains(&item)).then_some(item),
                 ));
             }
         }
diff --git a/kani-compiler/src/kani_middle/transform/mod.rs b/kani-compiler/src/kani_middle/transform/mod.rs
index 9976b8bd1dc9..8d84a9e4da54 100644
--- a/kani-compiler/src/kani_middle/transform/mod.rs
+++ b/kani-compiler/src/kani_middle/transform/mod.rs
@@ -136,11 +136,11 @@ impl BodyTransformation {
         instances: Vec<Instance>,
         call_graph: CallGraph,
     ) {
-        let mut global_passes: Vec<_> = self.global_passes.drain(0..).collect();
+        let mut global_passes = std::mem::take(&mut self.global_passes);
         for global_pass in global_passes.iter_mut() {
             global_pass.transform(tcx, &call_graph, starting_items, instances.clone(), self);
         }
-        self.global_passes.extend(global_passes);
+        std::mem::swap(&mut self.global_passes, &mut global_passes);
     }
 
     fn add_pass<P: TransformPass + 'static>(&mut self, query_db: &QueryDb, pass: P) {