From 4e827af392c2897b0a8f8f6f84856b16721d5f84 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Fri, 23 Aug 2019 22:47:54 -0700 Subject: [PATCH] Remove unnecessary trailing semicolons (#5636) --- core/src/rpc.rs | 2 +- core/src/window_service.rs | 2 +- kvstore/benches/basic.rs | 2 +- kvstore/tests/basic.rs | 2 +- local_cluster/tests/replicator.rs | 2 +- runtime/src/accounts_db.rs | 4 ++-- runtime/src/bank.rs | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/src/rpc.rs b/core/src/rpc.rs index e43edb718..114e0098a 100644 --- a/core/src/rpc.rs +++ b/core/src/rpc.rs @@ -554,7 +554,7 @@ impl RpcSol for RpcSolImpl { .map_err(|err| { info!("request_airdrop_transaction failed: {:?}", err); Error::internal_error() - })?;; + })?; let data = serialize(&transaction).map_err(|err| { info!("request_airdrop: serialize error: {:?}", err); diff --git a/core/src/window_service.rs b/core/src/window_service.rs index 242ee6817..0efdfdf90 100644 --- a/core/src/window_service.rs +++ b/core/src/window_service.rs @@ -408,7 +408,7 @@ mod test { ) .into_iter() .rev() - .collect();; + .collect(); s_responder.send(msgs).expect("send"); t_responder }; diff --git a/kvstore/benches/basic.rs b/kvstore/benches/basic.rs index db96c5239..c1c74f1c5 100644 --- a/kvstore/benches/basic.rs +++ b/kvstore/benches/basic.rs @@ -146,7 +146,7 @@ fn bench_read_random(bench: &mut Bencher) { } fn setup(test_name: &str) -> PathBuf { - let dir = Path::new("kvstore-bench").join(test_name);; + let dir = Path::new("kvstore-bench").join(test_name); let _ig = fs::remove_dir_all(&dir); fs::create_dir_all(&dir).unwrap(); diff --git a/kvstore/tests/basic.rs b/kvstore/tests/basic.rs index 5ee0b4200..804ac981e 100644 --- a/kvstore/tests/basic.rs +++ b/kvstore/tests/basic.rs @@ -227,7 +227,7 @@ fn test_in_memory() { } fn setup(test_name: &str) -> PathBuf { - let dir = Path::new("kvstore-test").join(test_name);; + let dir = Path::new("kvstore-test").join(test_name); let _ig = fs::remove_dir_all(&dir); fs::create_dir_all(&dir).unwrap(); diff --git a/local_cluster/tests/replicator.rs b/local_cluster/tests/replicator.rs index 16189b0f2..a6addd107 100644 --- a/local_cluster/tests/replicator.rs +++ b/local_cluster/tests/replicator.rs @@ -131,7 +131,7 @@ fn test_replicator_startup_ledger_hang() { info!("starting replicator test"); let mut validator_config = ValidatorConfig::default(); validator_config.storage_slots_per_turn = SLOTS_PER_TURN_TEST; - let cluster = LocalCluster::new_with_equal_stakes(2, 10_000, 100);; + let cluster = LocalCluster::new_with_equal_stakes(2, 10_000, 100); info!("starting replicator node"); let bad_keys = Arc::new(Keypair::new()); diff --git a/runtime/src/accounts_db.rs b/runtime/src/accounts_db.rs index f444ee966..17094ba74 100644 --- a/runtime/src/accounts_db.rs +++ b/runtime/src/accounts_db.rs @@ -1345,9 +1345,9 @@ pub mod tests { let mut pubkeys: Vec = vec![]; create_account(&accounts, &mut pubkeys, 0, 1, 0, 0); let ancestors = vec![(0, 0)].into_iter().collect(); - assert!(accounts.load_slow(&ancestors, &pubkeys[0]).is_some());; + assert!(accounts.load_slow(&ancestors, &pubkeys[0]).is_some()); accounts.purge_fork(0); - assert!(accounts.load_slow(&ancestors, &pubkeys[0]).is_none());; + assert!(accounts.load_slow(&ancestors, &pubkeys[0]).is_none()); } #[test] diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs index d892d97e0..804d170b8 100644 --- a/runtime/src/bank.rs +++ b/runtime/src/bank.rs @@ -2809,7 +2809,7 @@ mod tests { let mut reader = BufReader::new(&buf[rdr.position() as usize..]); // Create a new set of directories for this bank's accounts - let (_accounts_dir, dbank_paths) = get_temp_accounts_paths(4).unwrap();; + let (_accounts_dir, dbank_paths) = get_temp_accounts_paths(4).unwrap(); dbank.set_bank_rc( &BankRc::new(dbank_paths.clone(), 0, dbank.slot()), &StatusCacheRc::default(),