Fix Rust 1.37.0 compiler warnings (#5530)
Looks like most usages of trait objects should have introduced a type variable instead.
This commit is contained in:
parent
75a2b74751
commit
471bc73a23
|
@ -660,7 +660,7 @@ fn verify_funding_transfer<T: SyncClient + ?Sized>(
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn fund_keys(client: &Client, source: &Keypair, dests: &[Arc<Keypair>], lamports: u64) {
|
pub fn fund_keys(client: &dyn Client, source: &Keypair, dests: &[Arc<Keypair>], lamports: u64) {
|
||||||
let total = lamports * (dests.len() as u64 + 1);
|
let total = lamports * (dests.len() as u64 + 1);
|
||||||
let mut funded: Vec<(&Keypair, u64)> = vec![(source, total)];
|
let mut funded: Vec<(&Keypair, u64)> = vec![(source, total)];
|
||||||
let mut notfunded: Vec<&Arc<Keypair>> = dests.iter().collect();
|
let mut notfunded: Vec<&Arc<Keypair>> = dests.iter().collect();
|
||||||
|
@ -778,7 +778,7 @@ pub fn fund_keys(client: &Client, source: &Keypair, dests: &[Arc<Keypair>], lamp
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn create_token_accounts(client: &Client, signers: &[Arc<Keypair>], accounts: &[Pubkey]) {
|
pub fn create_token_accounts(client: &dyn Client, signers: &[Arc<Keypair>], accounts: &[Pubkey]) {
|
||||||
let mut notfunded: Vec<(&Arc<Keypair>, &Pubkey)> = signers.iter().zip(accounts).collect();
|
let mut notfunded: Vec<(&Arc<Keypair>, &Pubkey)> = signers.iter().zip(accounts).collect();
|
||||||
|
|
||||||
while !notfunded.is_empty() {
|
while !notfunded.is_empty() {
|
||||||
|
@ -908,7 +908,7 @@ fn generate_keypairs(num: u64) -> Vec<Keypair> {
|
||||||
rnd.gen_n_keypairs(num)
|
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 = client.get_balance(&id.pubkey());
|
||||||
let balance = balance.unwrap_or(0);
|
let balance = balance.unwrap_or(0);
|
||||||
if balance >= amount {
|
if balance >= amount {
|
||||||
|
|
|
@ -20,7 +20,7 @@ use std::thread::sleep;
|
||||||
use std::time::{Duration, Instant};
|
use std::time::{Duration, Instant};
|
||||||
|
|
||||||
pub struct RpcClient {
|
pub struct RpcClient {
|
||||||
client: Box<GenericRpcClientRequest + Send + Sync>,
|
client: Box<dyn GenericRpcClientRequest + Send + Sync>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl RpcClient {
|
impl RpcClient {
|
||||||
|
|
|
@ -1294,7 +1294,12 @@ mod tests {
|
||||||
];
|
];
|
||||||
|
|
||||||
let mut results = vec![Ok(()), Ok(())];
|
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();
|
let (_, entries) = entry_receiver.recv().unwrap();
|
||||||
assert_eq!(entries[0].0.transactions.len(), transactions.len());
|
assert_eq!(entries[0].0.transactions.len(), transactions.len());
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@ use std::net::{Ipv4Addr, SocketAddr};
|
||||||
use std::sync::{Arc, Mutex};
|
use std::sync::{Arc, Mutex};
|
||||||
use std::thread;
|
use std::thread;
|
||||||
|
|
||||||
fn main() -> Result<(), Box<error::Error>> {
|
fn main() -> Result<(), Box<dyn error::Error>> {
|
||||||
solana_logger::setup_with_filter("solana=info");
|
solana_logger::setup_with_filter("solana=info");
|
||||||
solana_metrics::set_panic_hook("drone");
|
solana_metrics::set_panic_hook("drone");
|
||||||
let matches = App::new(crate_name!())
|
let matches = App::new(crate_name!())
|
||||||
|
|
|
@ -40,7 +40,10 @@ impl Signable for SignedUpdateManifest {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl SignedUpdateManifest {
|
impl SignedUpdateManifest {
|
||||||
pub fn deserialize(account_pubkey: &Pubkey, input: &[u8]) -> Result<Self, Box<error::Error>> {
|
pub fn deserialize(
|
||||||
|
account_pubkey: &Pubkey,
|
||||||
|
input: &[u8],
|
||||||
|
) -> Result<Self, Box<dyn error::Error>> {
|
||||||
let mut manifest: SignedUpdateManifest = bincode::deserialize(input)?;
|
let mut manifest: SignedUpdateManifest = bincode::deserialize(input)?;
|
||||||
manifest.account_pubkey = *account_pubkey;
|
manifest.account_pubkey = *account_pubkey;
|
||||||
if !manifest.verify() {
|
if !manifest.verify() {
|
||||||
|
|
|
@ -332,7 +332,7 @@ fn load_tables(root: &Path, mapper: &dyn Mapper) -> Result<Vec<BTreeMap<Key, SST
|
||||||
Ok(tables)
|
Ok(tables)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn dump_tables(root: &Path, mapper: &Mapper) -> Result<()> {
|
fn dump_tables(root: &Path, mapper: &dyn Mapper) -> Result<()> {
|
||||||
mapper.serialize_state_to(&root.join(TABLES_FILE))?;
|
mapper.serialize_state_to(&root.join(TABLES_FILE))?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,7 @@ pub use self::disk::Disk;
|
||||||
pub use self::memory::Memory;
|
pub use self::memory::Memory;
|
||||||
|
|
||||||
pub trait Mapper: std::fmt::Debug + Send + Sync {
|
pub trait Mapper: std::fmt::Debug + Send + Sync {
|
||||||
fn make_table(&self, kind: Kind, func: &mut FnMut(Writer, Writer)) -> Result<SSTable>;
|
fn make_table(&self, kind: Kind, func: &mut dyn FnMut(Writer, Writer)) -> Result<SSTable>;
|
||||||
fn rotate_tables(&self) -> Result<()>;
|
fn rotate_tables(&self) -> Result<()>;
|
||||||
fn empty_trash(&self) -> Result<()>;
|
fn empty_trash(&self) -> Result<()>;
|
||||||
fn active_set(&self) -> Result<Vec<SSTable>>;
|
fn active_set(&self) -> Result<Vec<SSTable>>;
|
||||||
|
|
|
@ -78,7 +78,7 @@ impl Disk {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Mapper for Disk {
|
impl Mapper for Disk {
|
||||||
fn make_table(&self, kind: Kind, func: &mut FnMut(Writer, Writer)) -> Result<SSTable> {
|
fn make_table(&self, kind: Kind, func: &mut dyn FnMut(Writer, Writer)) -> Result<SSTable> {
|
||||||
let storage = self.choose_storage();
|
let storage = self.choose_storage();
|
||||||
|
|
||||||
let id = next_id(kind);
|
let id = next_id(kind);
|
||||||
|
|
|
@ -51,7 +51,7 @@ impl Memory {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Mapper for Memory {
|
impl Mapper for Memory {
|
||||||
fn make_table(&self, kind: Kind, func: &mut FnMut(Writer, Writer)) -> Result<SSTable> {
|
fn make_table(&self, kind: Kind, func: &mut dyn FnMut(Writer, Writer)) -> Result<SSTable> {
|
||||||
let backing = self.get_backing(kind);
|
let backing = self.get_backing(kind);
|
||||||
let id = next_id();
|
let id = next_id();
|
||||||
|
|
||||||
|
|
|
@ -109,7 +109,7 @@ trait LogWriter: std::fmt::Debug + Write + Send + Sync {
|
||||||
/// Holds actual logging related state
|
/// Holds actual logging related state
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
struct Logger {
|
struct Logger {
|
||||||
writer: Box<LogWriter>,
|
writer: Box<dyn LogWriter>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Logger {
|
impl Logger {
|
||||||
|
|
|
@ -247,15 +247,15 @@ fn main() {
|
||||||
})
|
})
|
||||||
.collect();
|
.collect();
|
||||||
|
|
||||||
let mut output_file: Box<Write> = if let Some(path) = args_matches.value_of("slot_list")
|
let mut output_file: Box<dyn Write> =
|
||||||
{
|
if let Some(path) = args_matches.value_of("slot_list") {
|
||||||
match File::create(path) {
|
match File::create(path) {
|
||||||
Ok(file) => Box::new(file),
|
Ok(file) => Box::new(file),
|
||||||
_ => Box::new(stdout()),
|
_ => Box::new(stdout()),
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
Box::new(stdout())
|
Box::new(stdout())
|
||||||
};
|
};
|
||||||
|
|
||||||
slot_hash
|
slot_hash
|
||||||
.into_iter()
|
.into_iter()
|
||||||
|
|
|
@ -236,7 +236,7 @@ impl Default for MetricsAgent {
|
||||||
|
|
||||||
impl MetricsAgent {
|
impl MetricsAgent {
|
||||||
fn new(
|
fn new(
|
||||||
writer: Arc<MetricsWriter + Send + Sync>,
|
writer: Arc<dyn MetricsWriter + Send + Sync>,
|
||||||
write_frequency_secs: Duration,
|
write_frequency_secs: Duration,
|
||||||
max_points_per_sec: usize,
|
max_points_per_sec: usize,
|
||||||
) -> Self {
|
) -> Self {
|
||||||
|
@ -251,7 +251,7 @@ impl MetricsAgent {
|
||||||
points: &[Point],
|
points: &[Point],
|
||||||
last_write_time: Instant,
|
last_write_time: Instant,
|
||||||
max_points: usize,
|
max_points: usize,
|
||||||
writer: &Arc<MetricsWriter + Send + Sync>,
|
writer: &Arc<dyn MetricsWriter + Send + Sync>,
|
||||||
max_points_per_sec: usize,
|
max_points_per_sec: usize,
|
||||||
) -> usize {
|
) -> usize {
|
||||||
if points.is_empty() {
|
if points.is_empty() {
|
||||||
|
@ -296,7 +296,7 @@ impl MetricsAgent {
|
||||||
|
|
||||||
fn run(
|
fn run(
|
||||||
receiver: &Receiver<MetricsCommand>,
|
receiver: &Receiver<MetricsCommand>,
|
||||||
writer: &Arc<MetricsWriter + Send + Sync>,
|
writer: &Arc<dyn MetricsWriter + Send + Sync>,
|
||||||
write_frequency_secs: Duration,
|
write_frequency_secs: Duration,
|
||||||
max_points_per_sec: usize,
|
max_points_per_sec: usize,
|
||||||
) {
|
) {
|
||||||
|
|
|
@ -6,7 +6,7 @@ use std::sync::atomic::AtomicBool;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
pub const RPC_PORT: u16 = 8989;
|
pub const RPC_PORT: u16 = 8989;
|
||||||
|
|
||||||
fn main() -> Result<(), Box<error::Error>> {
|
fn main() -> Result<(), Box<dyn error::Error>> {
|
||||||
solana_metrics::set_panic_hook("vote-signer");
|
solana_metrics::set_panic_hook("vote-signer");
|
||||||
|
|
||||||
let matches = App::new(crate_name!())
|
let matches = App::new(crate_name!())
|
||||||
|
|
Loading…
Reference in New Issue