Drop all manual guard drops.

tests/agreement_tests.rs

@@ -27,7 +27,7 @@ fn basic_agreement() -> config::Result<()> {
         );
     }
 
-    drop(_guard);
+    cfg.end();
     Ok(())
 }
 
@@ -61,8 +61,6 @@ fn fail_agree() -> config::Result<()> {
     cfg.one(107, SERVERS, true)?;
 
     cfg.end();
-
-    drop(_guard);
     Ok(())
 }
 
@@ -112,8 +110,6 @@ fn fail_no_agree() -> config::Result<()> {
     cfg.one(1000, SERVERS, true)?;
 
     cfg.end();
-
-    drop(_guard);
     Ok(())
 }
 
@@ -154,8 +150,6 @@ fn rejoin() -> config::Result<()> {
     cfg.one(105, SERVERS, true)?;
 
     cfg.end();
-
-    drop(_guard);
     Ok(())
 }
 
@@ -233,8 +227,6 @@ fn backup() -> config::Result<()> {
     cfg.one(thread_rng().gen(), SERVERS, true)?;
 
     cfg.end();
-
-    drop(_guard);
     Ok(())
 }
 
@@ -337,7 +329,5 @@ fn count() -> config::Result<()> {
     assert!(diff < 3 * 20, "too many RPCs ({}) for 1 second of idleness");
 
     cfg.end();
-
-    drop(_guard);
     Ok(())
 }

tests/election_tests.rs

@@ -30,8 +30,6 @@ fn initial_election() -> config::Result<()> {
     cfg.check_one_leader()?;
 
     cfg.end();
-
-    drop(guard);
     Ok(())
 }
 
@@ -64,7 +62,5 @@ fn re_election() -> config::Result<()> {
     cfg.check_one_leader()?;
 
     cfg.end();
-
-    drop(_guard);
     Ok(())
 }

tests/persist_tests.rs

@@ -58,8 +58,6 @@ fn persist() -> config::Result<()> {
     cfg.one(16, SERVERS, true)?;
 
     cfg.end();
-
-    drop(_guard);
     Ok(())
 }
 
@@ -110,8 +108,6 @@ fn persist2() -> config::Result<()> {
     cfg.one(1000, SERVERS, true)?;
 
     cfg.end();
-
-    drop(_guard);
     Ok(())
 }
 
@@ -145,8 +141,7 @@ fn persist3() -> config::Result<()> {
 
     cfg.one(104, SERVERS, true)?;
 
-    drop(_guard);
-
+    cfg.end();
     Ok(())
 }
 
@@ -205,8 +200,6 @@ fn figure8() -> config::Result<()> {
     cfg.one(thread_rng().gen(), SERVERS, true)?;
 
     cfg.end();
-
-    drop(_guard);
     Ok(())
 }
 
@@ -241,8 +234,6 @@ fn unreliable_agree() -> config::Result<()> {
     cfg.one(100, SERVERS, true)?;
 
     cfg.end();
-
-    drop(_guard);
     Ok(())
 }
 
@@ -306,7 +297,7 @@ fn figure8_unreliable() -> config::Result<()> {
 
     cfg.one(thread_rng().gen_range(0, 10000), SERVERS, true)?;
 
-    drop(_guard);
+    cfg.end();
     Ok(())
 }
 
@@ -424,8 +415,6 @@ fn internal_churn(unreliable: bool) -> config::Result<()> {
     }
 
     cfg.end();
-
-    drop(_guard);
     Ok(())
 }