Remove scopeguard from dependencies.

kvraft/Cargo.toml

@@ -12,7 +12,6 @@ parking_lot = "0.11.1"
 rand = "0.8"
 ruaft = { path = "../" }
 linearizability = { path = "../linearizability" }
-scopeguard = "1.1.0"
 serde = "1.0.116"
 serde_derive = "1.0.116"
 tokio = { version = "1.0", features = ["rt-multi-thread", "time", "parking_lot"] }

kvraft/src/lib.rs

@@ -3,8 +3,6 @@ extern crate labrpc;
 extern crate parking_lot;
 extern crate rand;
 extern crate ruaft;
-#[macro_use]
-extern crate scopeguard;
 extern crate serde;
 #[macro_use]
 extern crate serde_derive;

kvraft/src/testing_utils/generic_test.rs

@@ -168,7 +168,6 @@ pub fn generic_test(test_params: GenericTestParams) {
     let min_ops = min_ops.unwrap_or(10);
     let servers: usize = if test_linearizability { 7 } else { 5 };
     let cfg = Arc::new(make_config(servers, unreliable, maxraftstate));
-    defer!(cfg.clean_up());
 
     cfg.begin("");
     let mut clerk = cfg.make_clerk();
@@ -273,6 +272,7 @@ pub fn generic_test(test_params: GenericTestParams) {
     }
 
     cfg.end();
+    cfg.clean_up();
 
     for (index, laps) in laps.iter().enumerate() {
         eprintln!("Round {} diagnostics: {:?}", index, laps);