diff --git a/bench-tps/src/bench.rs b/bench-tps/src/bench.rs index fe7c4f7915..16e32a1215 100644 --- a/bench-tps/src/bench.rs +++ b/bench-tps/src/bench.rs @@ -110,7 +110,7 @@ fn generate_chunked_transfers( shared_txs: &SharedTransactions, shared_tx_active_thread_count: Arc, source_keypair_chunks: Vec>, - dest_keypair_chunks: &mut Vec>, + dest_keypair_chunks: &mut [VecDeque<&Keypair>], threads: usize, duration: Duration, sustained: bool, diff --git a/core/src/heaviest_subtree_fork_choice.rs b/core/src/heaviest_subtree_fork_choice.rs index 66ecc3c2c6..1a360ee844 100644 --- a/core/src/heaviest_subtree_fork_choice.rs +++ b/core/src/heaviest_subtree_fork_choice.rs @@ -2715,7 +2715,8 @@ mod test { stake ); } - for slot in &[17] { + { + let slot = &17; assert_eq!( tree1 .stake_voted_subtree(&(*slot, Hash::default())) diff --git a/core/src/repair_weight.rs b/core/src/repair_weight.rs index ae535804fb..b45c235d3f 100644 --- a/core/src/repair_weight.rs +++ b/core/src/repair_weight.rs @@ -642,7 +642,7 @@ impl RepairWeight { } // Heavier, smaller slots come first - fn sort_by_stake_weight_slot(slot_stake_voted: &mut Vec<(Slot, u64)>) { + fn sort_by_stake_weight_slot(slot_stake_voted: &mut [(Slot, u64)]) { slot_stake_voted.sort_by(|(slot, stake_voted), (slot_, stake_voted_)| { if stake_voted == stake_voted_ { slot.cmp(slot_) diff --git a/perf/src/sigverify.rs b/perf/src/sigverify.rs index e11c9409c0..1ba75823da 100644 --- a/perf/src/sigverify.rs +++ b/perf/src/sigverify.rs @@ -507,7 +507,7 @@ impl Deduper { } //inplace shrink a batch of packets -pub fn shrink_batches(batches: &mut Vec) -> usize { +pub fn shrink_batches(batches: &mut [PacketBatch]) -> usize { let mut valid_batch_ix = 0; let mut valid_packet_ix = 0; let mut last_valid_batch = 0; @@ -570,7 +570,7 @@ pub fn ed25519_verify_disabled(batches: &mut [PacketBatch]) { inc_new_counter_debug!("ed25519_verify_disabled", packet_count); } -pub fn copy_return_values(sig_lens: &[Vec], out: &PinnedVec, rvs: &mut Vec>) { +pub fn copy_return_values(sig_lens: &[Vec], out: &PinnedVec, rvs: &mut [Vec]) { let mut num = 0; for (vs, sig_vs) in rvs.iter_mut().zip(sig_lens.iter()) { for (v, sig_v) in vs.iter_mut().zip(sig_vs.iter()) { @@ -1531,9 +1531,9 @@ mod tests { // No batches // truncate of 1 on len 0 is a noop - assert_eq!(shrink_batches(&mut vec![]), 0); + assert_eq!(shrink_batches(&mut []), 0); // One empty batch - assert_eq!(shrink_batches(&mut vec![PacketBatch::with_capacity(0)]), 0); + assert_eq!(shrink_batches(&mut [PacketBatch::with_capacity(0)]), 0); // Many empty batches let mut batches = (0..BATCH_COUNT) .map(|_| PacketBatch::with_capacity(0)) diff --git a/rpc/src/rpc.rs b/rpc/src/rpc.rs index 843686bbfe..b29e24c9f5 100644 --- a/rpc/src/rpc.rs +++ b/rpc/src/rpc.rs @@ -2075,7 +2075,7 @@ impl JsonRpcRequestProcessor { } } -fn optimize_filters(filters: &mut Vec) { +fn optimize_filters(filters: &mut [RpcFilterType]) { filters.iter_mut().for_each(|filter_type| { if let RpcFilterType::Memcmp(compare) = filter_type { use MemcmpEncodedBytes::*; diff --git a/streamer/src/sendmmsg.rs b/streamer/src/sendmmsg.rs index 47abcc0af8..b236473b65 100644 --- a/streamer/src/sendmmsg.rs +++ b/streamer/src/sendmmsg.rs @@ -84,12 +84,12 @@ fn mmsghdr_for_packet( } #[cfg(target_os = "linux")] -fn sendmmsg_retry(sock: &UdpSocket, hdrs: &mut Vec) -> Result<(), SendPktsError> { +fn sendmmsg_retry(sock: &UdpSocket, hdrs: &mut [mmsghdr]) -> Result<(), SendPktsError> { let sock_fd = sock.as_raw_fd(); let mut total_sent = 0; let mut erropt = None; - let mut pkts = &mut hdrs[..]; + let mut pkts = &mut *hdrs; while !pkts.is_empty() { let npkts = match unsafe { libc::sendmmsg(sock_fd, &mut pkts[0], pkts.len() as u32, 0) } { -1 => {