From 471bc73a23d711dd770772c1489c475ec1925ab3 Mon Sep 17 00:00:00 2001 From: Greg Fitzgerald Date: Thu, 15 Aug 2019 14:00:09 -0600 Subject: [PATCH] Fix Rust 1.37.0 compiler warnings (#5530) Looks like most usages of trait objects should have introduced a type variable instead. --- bench-exchange/src/bench.rs | 6 +++--- client/src/rpc_client.rs | 2 +- core/src/banking_stage.rs | 7 ++++++- drone/src/bin/drone.rs | 2 +- install/src/update_manifest.rs | 5 ++++- kvstore/src/lib.rs | 2 +- kvstore/src/mapper.rs | 2 +- kvstore/src/mapper/disk.rs | 2 +- kvstore/src/mapper/memory.rs | 2 +- kvstore/src/writelog.rs | 2 +- ledger-tool/src/main.rs | 18 +++++++++--------- metrics/src/metrics.rs | 6 +++--- vote-signer/src/bin/main.rs | 2 +- 13 files changed, 33 insertions(+), 25 deletions(-) diff --git a/bench-exchange/src/bench.rs b/bench-exchange/src/bench.rs index add1d86e91..dbde10deff 100644 --- a/bench-exchange/src/bench.rs +++ b/bench-exchange/src/bench.rs @@ -660,7 +660,7 @@ fn verify_funding_transfer( false } -pub fn fund_keys(client: &Client, source: &Keypair, dests: &[Arc], lamports: u64) { +pub fn fund_keys(client: &dyn Client, source: &Keypair, dests: &[Arc], lamports: u64) { let total = lamports * (dests.len() as u64 + 1); let mut funded: Vec<(&Keypair, u64)> = vec![(source, total)]; let mut notfunded: Vec<&Arc> = dests.iter().collect(); @@ -778,7 +778,7 @@ pub fn fund_keys(client: &Client, source: &Keypair, dests: &[Arc], lamp } } -pub fn create_token_accounts(client: &Client, signers: &[Arc], accounts: &[Pubkey]) { +pub fn create_token_accounts(client: &dyn Client, signers: &[Arc], accounts: &[Pubkey]) { let mut notfunded: Vec<(&Arc, &Pubkey)> = signers.iter().zip(accounts).collect(); while !notfunded.is_empty() { @@ -908,7 +908,7 @@ fn generate_keypairs(num: u64) -> Vec { rnd.gen_n_keypairs(num) } -pub fn airdrop_lamports(client: &Client, drone_addr: &SocketAddr, id: &Keypair, amount: u64) { +pub fn airdrop_lamports(client: &dyn Client, drone_addr: &SocketAddr, id: &Keypair, amount: u64) { let balance = client.get_balance(&id.pubkey()); let balance = balance.unwrap_or(0); if balance >= amount { diff --git a/client/src/rpc_client.rs b/client/src/rpc_client.rs index ce3f571e8b..426bae222d 100644 --- a/client/src/rpc_client.rs +++ b/client/src/rpc_client.rs @@ -20,7 +20,7 @@ use std::thread::sleep; use std::time::{Duration, Instant}; pub struct RpcClient { - client: Box, + client: Box, } impl RpcClient { diff --git a/core/src/banking_stage.rs b/core/src/banking_stage.rs index c9cf097104..38aa067593 100644 --- a/core/src/banking_stage.rs +++ b/core/src/banking_stage.rs @@ -1294,7 +1294,12 @@ mod tests { ]; let mut results = vec![Ok(()), Ok(())]; - BankingStage::record_transactions(bank.slot(), &transactions, &results, &poh_recorder); + let _ = BankingStage::record_transactions( + bank.slot(), + &transactions, + &results, + &poh_recorder, + ); let (_, entries) = entry_receiver.recv().unwrap(); assert_eq!(entries[0].0.transactions.len(), transactions.len()); diff --git a/drone/src/bin/drone.rs b/drone/src/bin/drone.rs index 1b9d30358a..968cb06f80 100644 --- a/drone/src/bin/drone.rs +++ b/drone/src/bin/drone.rs @@ -7,7 +7,7 @@ use std::net::{Ipv4Addr, SocketAddr}; use std::sync::{Arc, Mutex}; use std::thread; -fn main() -> Result<(), Box> { +fn main() -> Result<(), Box> { solana_logger::setup_with_filter("solana=info"); solana_metrics::set_panic_hook("drone"); let matches = App::new(crate_name!()) diff --git a/install/src/update_manifest.rs b/install/src/update_manifest.rs index 12666b89c6..2a6a2e16fd 100644 --- a/install/src/update_manifest.rs +++ b/install/src/update_manifest.rs @@ -40,7 +40,10 @@ impl Signable for SignedUpdateManifest { } impl SignedUpdateManifest { - pub fn deserialize(account_pubkey: &Pubkey, input: &[u8]) -> Result> { + pub fn deserialize( + account_pubkey: &Pubkey, + input: &[u8], + ) -> Result> { let mut manifest: SignedUpdateManifest = bincode::deserialize(input)?; manifest.account_pubkey = *account_pubkey; if !manifest.verify() { diff --git a/kvstore/src/lib.rs b/kvstore/src/lib.rs index a681c09595..3bb35743c7 100644 --- a/kvstore/src/lib.rs +++ b/kvstore/src/lib.rs @@ -332,7 +332,7 @@ fn load_tables(root: &Path, mapper: &dyn Mapper) -> Result Result<()> { +fn dump_tables(root: &Path, mapper: &dyn Mapper) -> Result<()> { mapper.serialize_state_to(&root.join(TABLES_FILE))?; Ok(()) } diff --git a/kvstore/src/mapper.rs b/kvstore/src/mapper.rs index 87228f4810..7fa4b3e20d 100644 --- a/kvstore/src/mapper.rs +++ b/kvstore/src/mapper.rs @@ -12,7 +12,7 @@ pub use self::disk::Disk; pub use self::memory::Memory; pub trait Mapper: std::fmt::Debug + Send + Sync { - fn make_table(&self, kind: Kind, func: &mut FnMut(Writer, Writer)) -> Result; + fn make_table(&self, kind: Kind, func: &mut dyn FnMut(Writer, Writer)) -> Result; fn rotate_tables(&self) -> Result<()>; fn empty_trash(&self) -> Result<()>; fn active_set(&self) -> Result>; diff --git a/kvstore/src/mapper/disk.rs b/kvstore/src/mapper/disk.rs index 8e27174db0..0fc48a12de 100644 --- a/kvstore/src/mapper/disk.rs +++ b/kvstore/src/mapper/disk.rs @@ -78,7 +78,7 @@ impl Disk { } impl Mapper for Disk { - fn make_table(&self, kind: Kind, func: &mut FnMut(Writer, Writer)) -> Result { + fn make_table(&self, kind: Kind, func: &mut dyn FnMut(Writer, Writer)) -> Result { let storage = self.choose_storage(); let id = next_id(kind); diff --git a/kvstore/src/mapper/memory.rs b/kvstore/src/mapper/memory.rs index 9e762c8b4e..9a90658af6 100644 --- a/kvstore/src/mapper/memory.rs +++ b/kvstore/src/mapper/memory.rs @@ -51,7 +51,7 @@ impl Memory { } impl Mapper for Memory { - fn make_table(&self, kind: Kind, func: &mut FnMut(Writer, Writer)) -> Result { + fn make_table(&self, kind: Kind, func: &mut dyn FnMut(Writer, Writer)) -> Result { let backing = self.get_backing(kind); let id = next_id(); diff --git a/kvstore/src/writelog.rs b/kvstore/src/writelog.rs index 12fe68589e..97cda03531 100644 --- a/kvstore/src/writelog.rs +++ b/kvstore/src/writelog.rs @@ -109,7 +109,7 @@ trait LogWriter: std::fmt::Debug + Write + Send + Sync { /// Holds actual logging related state #[derive(Debug)] struct Logger { - writer: Box, + writer: Box, } impl Logger { diff --git a/ledger-tool/src/main.rs b/ledger-tool/src/main.rs index d5d2cff1f8..4e90fe4c01 100644 --- a/ledger-tool/src/main.rs +++ b/ledger-tool/src/main.rs @@ -247,15 +247,15 @@ fn main() { }) .collect(); - let mut output_file: Box = if let Some(path) = args_matches.value_of("slot_list") - { - match File::create(path) { - Ok(file) => Box::new(file), - _ => Box::new(stdout()), - } - } else { - Box::new(stdout()) - }; + let mut output_file: Box = + if let Some(path) = args_matches.value_of("slot_list") { + match File::create(path) { + Ok(file) => Box::new(file), + _ => Box::new(stdout()), + } + } else { + Box::new(stdout()) + }; slot_hash .into_iter() diff --git a/metrics/src/metrics.rs b/metrics/src/metrics.rs index 74c7807706..58ef1b1a02 100644 --- a/metrics/src/metrics.rs +++ b/metrics/src/metrics.rs @@ -236,7 +236,7 @@ impl Default for MetricsAgent { impl MetricsAgent { fn new( - writer: Arc, + writer: Arc, write_frequency_secs: Duration, max_points_per_sec: usize, ) -> Self { @@ -251,7 +251,7 @@ impl MetricsAgent { points: &[Point], last_write_time: Instant, max_points: usize, - writer: &Arc, + writer: &Arc, max_points_per_sec: usize, ) -> usize { if points.is_empty() { @@ -296,7 +296,7 @@ impl MetricsAgent { fn run( receiver: &Receiver, - writer: &Arc, + writer: &Arc, write_frequency_secs: Duration, max_points_per_sec: usize, ) { diff --git a/vote-signer/src/bin/main.rs b/vote-signer/src/bin/main.rs index 1da2e9a9cf..fb12524ff0 100644 --- a/vote-signer/src/bin/main.rs +++ b/vote-signer/src/bin/main.rs @@ -6,7 +6,7 @@ use std::sync::atomic::AtomicBool; use std::sync::Arc; pub const RPC_PORT: u16 = 8989; -fn main() -> Result<(), Box> { +fn main() -> Result<(), Box> { solana_metrics::set_panic_hook("vote-signer"); let matches = App::new(crate_name!())