From d2ed921bc657a969e6f525eccc7dc672667b39ad Mon Sep 17 00:00:00 2001 From: Jack May Date: Tue, 19 Nov 2019 20:15:37 -0800 Subject: [PATCH] Cleanup nightly warnings (#7055) --- core/benches/blocktree.rs | 4 +--- core/src/archiver.rs | 8 ++++---- core/src/cluster_info.rs | 2 +- core/src/consensus.rs | 2 +- core/src/repair_service.rs | 4 ++-- ledger/src/blocktree.rs | 4 ++-- programs/bpf_loader_api/src/helpers.rs | 12 ++++++------ 7 files changed, 17 insertions(+), 19 deletions(-) diff --git a/core/benches/blocktree.rs b/core/benches/blocktree.rs index 0cf9bb901..ea12654fb 100644 --- a/core/benches/blocktree.rs +++ b/core/benches/blocktree.rs @@ -1,10 +1,8 @@ #![feature(test)] use rand; -extern crate test; - -#[macro_use] extern crate solana_ledger; +extern crate test; use rand::Rng; use solana_ledger::{ diff --git a/core/src/archiver.rs b/core/src/archiver.rs index 25c6e8ab8..446aebdae 100644 --- a/core/src/archiver.rs +++ b/core/src/archiver.rs @@ -450,7 +450,7 @@ impl Archiver { repair_socket: Arc, shred_fetch_receiver: PacketReceiver, slot_sender: Sender, - ) -> Result<(WindowService)> { + ) -> Result { let slots_per_segment = match Self::get_segment_config(&cluster_info, meta.client_commitment.clone()) { Ok(slots_per_segment) => slots_per_segment, @@ -598,7 +598,7 @@ impl Archiver { fn sample_file_to_create_mining_hash( enc_file_path: &Path, sampling_offsets: &[u64], - ) -> Result<(Hash)> { + ) -> Result { let sha_state = sample_file(enc_file_path, sampling_offsets)?; info!("sampled sha_state: {}", sha_state); Ok(sha_state) @@ -809,7 +809,7 @@ impl Archiver { Error::IO(io::Error::new(ErrorKind::Other, "rpc error")) })?; let (storage_blockhash, turn_slot) = - serde_json::from_value::<((String, u64))>(response).map_err(|err| { + serde_json::from_value::<(String, u64)>(response).map_err(|err| { io::Error::new( io::ErrorKind::Other, format!("Couldn't parse response: {:?}", err), @@ -851,7 +851,7 @@ impl Archiver { archiver_info: &ContactInfo, blocktree: &Arc, slots_per_segment: u64, - ) -> Result<(u64)> { + ) -> Result { // Create a client which downloads from the archiver and see that it // can respond with shreds. let start_slot = Self::get_archiver_segment_slot(archiver_info.storage_addr); diff --git a/core/src/cluster_info.rs b/core/src/cluster_info.rs index 091fb1a47..b97a2648a 100644 --- a/core/src/cluster_info.rs +++ b/core/src/cluster_info.rs @@ -637,7 +637,7 @@ impl ClusterInfo { fanout: usize, select_index: usize, curr_index: usize, - ) -> Option<(Locality)> { + ) -> Option { let end = layer_indices.len() - 1; let next = min(end, curr_index + 1); let layer_start = layer_indices[curr_index]; diff --git a/core/src/consensus.rs b/core/src/consensus.rs index f06b4ad3a..2815cd722 100644 --- a/core/src/consensus.rs +++ b/core/src/consensus.rs @@ -791,7 +791,7 @@ mod test { let mut account = Account::default(); account.lamports = 1; let set: HashSet = vec![0u64, 1u64].into_iter().collect(); - let ancestors: HashMap> = [(2u64, set)].into_iter().cloned().collect(); + let ancestors: HashMap> = [(2u64, set)].iter().cloned().collect(); Tower::update_ancestor_stakes(&mut stake_lockouts, 2, account.lamports, &ancestors); assert_eq!(stake_lockouts[&0].stake, 1); assert_eq!(stake_lockouts[&1].stake, 1); diff --git a/core/src/repair_service.rs b/core/src/repair_service.rs index 4dfefd83c..def7d7ddd 100644 --- a/core/src/repair_service.rs +++ b/core/src/repair_service.rs @@ -186,7 +186,7 @@ impl RepairService { blocktree: &Blocktree, max_repairs: usize, repair_range: &RepairSlotRange, - ) -> Result<(Vec)> { + ) -> Result> { // Slot height and shred indexes for shreds we want to repair let mut repairs: Vec = vec![]; for slot in repair_range.start..=repair_range.end { @@ -218,7 +218,7 @@ impl RepairService { blocktree: &Blocktree, root: u64, max_repairs: usize, - ) -> Result<(Vec)> { + ) -> Result> { // Slot height and shred indexes for shreds we want to repair let mut repairs: Vec = vec![]; Self::generate_repairs_for_fork(blocktree, &mut repairs, max_repairs, root); diff --git a/ledger/src/blocktree.rs b/ledger/src/blocktree.rs index dfc87120f..55d73dc5c 100644 --- a/ledger/src/blocktree.rs +++ b/ledger/src/blocktree.rs @@ -1759,7 +1759,7 @@ fn handle_chaining_for_slot( fn traverse_children_mut( db: &Database, slot: Slot, - slot_meta: &Rc>, + slot_meta: &Rc>, working_set: &HashMap, new_chained_slots: &mut HashMap>>, slot_function: F, @@ -1767,7 +1767,7 @@ fn traverse_children_mut( where F: Fn(&mut SlotMeta) -> bool, { - let mut next_slots: Vec<(u64, Rc>)> = vec![(slot, slot_meta.clone())]; + let mut next_slots: Vec<(u64, Rc>)> = vec![(slot, slot_meta.clone())]; while !next_slots.is_empty() { let (_, current_slot) = next_slots.pop().unwrap(); // Check whether we should explore the children of this slot diff --git a/programs/bpf_loader_api/src/helpers.rs b/programs/bpf_loader_api/src/helpers.rs index d482c8e9e..b8fc484ee 100644 --- a/programs/bpf_loader_api/src/helpers.rs +++ b/programs/bpf_loader_api/src/helpers.rs @@ -26,7 +26,7 @@ use crate::allocator_bump::BPFAllocator; /// are expected to enforce this const DEFAULT_HEAP_SIZE: usize = 32 * 1024; -pub fn register_helpers(vm: &mut EbpfVm) -> Result<(MemoryRegion), Error> { +pub fn register_helpers(vm: &mut EbpfVm) -> Result { vm.register_helper_ex("abort", helper_abort, None)?; vm.register_helper_ex("sol_panic", helper_sol_panic, None)?; vm.register_helper_ex("sol_panic_", helper_sol_panic, None)?; @@ -55,7 +55,7 @@ pub fn helper_abort( _context: &mut HelperContext, _ro_regions: &[MemoryRegion], _rw_regions: &[MemoryRegion], -) -> Result<(u64), Error> { +) -> Result { Err(Error::new( ErrorKind::Other, "Error: BPF program called abort()!", @@ -74,7 +74,7 @@ pub fn helper_sol_panic( _context: &mut HelperContext, ro_regions: &[MemoryRegion], _rw_regions: &[MemoryRegion], -) -> Result<(u64), Error> { +) -> Result { if let Ok(host_addr) = translate_addr(file, len as usize, "Load", 0, ro_regions) { let c_buf: *const c_char = host_addr as *const c_char; let c_str: &CStr = unsafe { CStr::from_ptr(c_buf) }; @@ -100,7 +100,7 @@ pub fn helper_sol_log( _context: &mut HelperContext, ro_regions: &[MemoryRegion], _rw_regions: &[MemoryRegion], -) -> Result<(u64), Error> { +) -> Result { if log_enabled!(log::Level::Info) { let host_addr = translate_addr(addr, len as usize, "Load", 0, ro_regions)?; let c_buf: *const c_char = host_addr as *const c_char; @@ -133,7 +133,7 @@ pub fn helper_sol_log_u64( _context: &mut HelperContext, _ro_regions: &[MemoryRegion], _rw_regions: &[MemoryRegion], -) -> Result<(u64), Error> { +) -> Result { if log_enabled!(log::Level::Info) { info!( "info!: {:#x}, {:#x}, {:#x}, {:#x}, {:#x}", @@ -158,7 +158,7 @@ pub fn helper_sol_alloc_free( context: &mut HelperContext, _ro_regions: &[MemoryRegion], _rw_regions: &[MemoryRegion], -) -> Result<(u64), Error> { +) -> Result { if let Some(context) = context { if let Some(allocator) = context.downcast_mut::() { return {