Address latest nightly clippy lints, but globally disable stable_sort_primitive

This commit is contained in:
Michael Vines 2020-08-14 11:43:14 -07:00
parent a86397a650
commit d15173ad9d
13 changed files with 27 additions and 3 deletions

View File

@ -53,7 +53,9 @@ _ cargo +"$rust_stable" fmt --all -- --check
# -Z... is needed because of clippy bug: https://github.com/rust-lang/rust-clippy/issues/4612 # -Z... is needed because of clippy bug: https://github.com/rust-lang/rust-clippy/issues/4612
# run nightly clippy for `sdk/` as there's a moderate amount of nightly-only code there # run nightly clippy for `sdk/` as there's a moderate amount of nightly-only code there
_ cargo +"$rust_nightly" clippy -Zunstable-options --workspace --all-targets -- --deny=warnings _ cargo +"$rust_nightly" clippy \
-Zunstable-options --workspace --all-targets \
-- --deny=warnings --allow=clippy::stable_sort_primitive
_ scripts/cargo-for-all-lock-files.sh +"$rust_stable" audit --ignore RUSTSEC-2020-0002 --ignore RUSTSEC-2020-0008 _ scripts/cargo-for-all-lock-files.sh +"$rust_stable" audit --ignore RUSTSEC-2020-0002 --ignore RUSTSEC-2020-0008

View File

@ -109,6 +109,7 @@ fn make_accounts_txs(txes: usize, mint_keypair: &Keypair, hash: Hash) -> Vec<Tra
.collect() .collect()
} }
#[allow(clippy::same_item_push)]
fn make_programs_txs(txes: usize, hash: Hash) -> Vec<Transaction> { fn make_programs_txs(txes: usize, hash: Hash) -> Vec<Transaction> {
let progs = 4; let progs = 4;
(0..txes) (0..txes)
@ -294,6 +295,7 @@ fn simulate_process_entries(
process_entries(&bank, &[entry], randomize_txs, None, None).unwrap(); process_entries(&bank, &[entry], randomize_txs, None, None).unwrap();
} }
#[allow(clippy::same_item_push)]
fn bench_process_entries(randomize_txs: bool, bencher: &mut Bencher) { fn bench_process_entries(randomize_txs: bool, bencher: &mut Bencher) {
// entropy multiplier should be big enough to provide sufficient entropy // entropy multiplier should be big enough to provide sufficient entropy
// but small enough to not take too much time while executing the test. // but small enough to not take too much time while executing the test.

View File

@ -27,6 +27,7 @@ use std::time::Duration;
use test::Bencher; use test::Bencher;
#[bench] #[bench]
#[allow(clippy::same_item_push)]
fn bench_retransmitter(bencher: &mut Bencher) { fn bench_retransmitter(bencher: &mut Bencher) {
solana_logger::setup(); solana_logger::setup();
let cluster_info = ClusterInfo::new_with_invalid_keypair(Node::new_localhost().info); let cluster_info = ClusterInfo::new_with_invalid_keypair(Node::new_localhost().info);

View File

@ -203,6 +203,7 @@ impl BroadcastStage {
/// which will then close FetchStage in the Tpu, and then the rest of the Tpu, /// which will then close FetchStage in the Tpu, and then the rest of the Tpu,
/// completing the cycle. /// completing the cycle.
#[allow(clippy::too_many_arguments)] #[allow(clippy::too_many_arguments)]
#[allow(clippy::same_item_push)]
fn new( fn new(
socks: Vec<UdpSocket>, socks: Vec<UdpSocket>,
cluster_info: Arc<ClusterInfo>, cluster_info: Arc<ClusterInfo>,

View File

@ -3345,6 +3345,7 @@ mod tests {
} }
#[test] #[test]
#[allow(clippy::same_item_push)]
fn test_push_epoch_slots_large() { fn test_push_epoch_slots_large() {
use rand::Rng; use rand::Rng;
let node_keypair = Arc::new(Keypair::new()); let node_keypair = Arc::new(Keypair::new());

View File

@ -451,6 +451,7 @@ mod tests {
} }
#[test] #[test]
#[allow(clippy::same_item_push)]
fn test_epoch_slots_fill_uncompressed_random_range() { fn test_epoch_slots_fill_uncompressed_random_range() {
use rand::Rng; use rand::Rng;
for _ in 0..10 { for _ in 0..10 {
@ -469,6 +470,7 @@ mod tests {
} }
#[test] #[test]
#[allow(clippy::same_item_push)]
fn test_epoch_slots_fill_compressed_random_range() { fn test_epoch_slots_fill_compressed_random_range() {
use rand::Rng; use rand::Rng;
for _ in 0..10 { for _ in 0..10 {
@ -489,6 +491,7 @@ mod tests {
} }
#[test] #[test]
#[allow(clippy::same_item_push)]
fn test_epoch_slots_fill_random_range() { fn test_epoch_slots_fill_random_range() {
use rand::Rng; use rand::Rng;
for _ in 0..10 { for _ in 0..10 {

View File

@ -6600,6 +6600,7 @@ pub mod tests {
} }
#[test] #[test]
#[allow(clippy::same_item_push)]
fn test_get_last_hash() { fn test_get_last_hash() {
let mut entries: Vec<Entry> = vec![]; let mut entries: Vec<Entry> = vec![];
let empty_entries_iterator = entries.iter(); let empty_entries_iterator = entries.iter();

View File

@ -638,6 +638,7 @@ pub fn next_entry_mut(start: &mut Hash, num_hashes: u64, transactions: Vec<Trans
entry entry
} }
#[allow(clippy::same_item_push)]
pub fn create_ticks(num_ticks: u64, hashes_per_tick: u64, mut hash: Hash) -> Vec<Entry> { pub fn create_ticks(num_ticks: u64, hashes_per_tick: u64, mut hash: Hash) -> Vec<Entry> {
let mut ticks = Vec::with_capacity(num_ticks as usize); let mut ticks = Vec::with_capacity(num_ticks as usize);
for _ in 0..num_ticks { for _ in 0..num_ticks {
@ -648,6 +649,7 @@ pub fn create_ticks(num_ticks: u64, hashes_per_tick: u64, mut hash: Hash) -> Vec
ticks ticks
} }
#[allow(clippy::same_item_push)]
pub fn create_random_ticks(num_ticks: u64, max_hashes_per_tick: u64, mut hash: Hash) -> Vec<Entry> { pub fn create_random_ticks(num_ticks: u64, max_hashes_per_tick: u64, mut hash: Hash) -> Vec<Entry> {
let mut ticks = Vec::with_capacity(num_ticks as usize); let mut ticks = Vec::with_capacity(num_ticks as usize);
for _ in 0..num_ticks { for _ in 0..num_ticks {

View File

@ -331,6 +331,7 @@ mod tests {
); );
} }
#[allow(clippy::same_item_push)]
fn process_instruction(instruction: &Instruction) -> Result<(), InstructionError> { fn process_instruction(instruction: &Instruction) -> Result<(), InstructionError> {
let mut accounts: Vec<_> = instruction let mut accounts: Vec<_> = instruction
.accounts .accounts

View File

@ -1966,6 +1966,7 @@ impl Bank {
} }
} }
#[allow(clippy::needless_collect)]
fn distribute_rent_to_validators( fn distribute_rent_to_validators(
&self, &self,
vote_account_hashmap: &HashMap<Pubkey, (u64, Account)>, vote_account_hashmap: &HashMap<Pubkey, (u64, Account)>,

View File

@ -92,7 +92,7 @@ impl SnapshotVersion {
} }
} }
#[derive(PartialEq, Ord, Eq, Debug)] #[derive(PartialEq, Eq, Debug)]
pub struct SlotSnapshotPaths { pub struct SlotSnapshotPaths {
pub slot: Slot, pub slot: Slot,
pub snapshot_file_path: PathBuf, pub snapshot_file_path: PathBuf,
@ -126,6 +126,12 @@ impl PartialOrd for SlotSnapshotPaths {
} }
} }
impl Ord for SlotSnapshotPaths {
fn cmp(&self, other: &Self) -> Ordering {
self.slot.cmp(&other.slot)
}
}
impl SlotSnapshotPaths { impl SlotSnapshotPaths {
fn copy_snapshot_directory<P: AsRef<Path>>(&self, snapshot_hardlink_dir: P) -> Result<()> { fn copy_snapshot_directory<P: AsRef<Path>>(&self, snapshot_hardlink_dir: P) -> Result<()> {
// Create a new directory in snapshot_hardlink_dir // Create a new directory in snapshot_hardlink_dir

View File

@ -158,8 +158,9 @@ impl Pubkey {
/// Find a valid program address and its corresponding nonce which must be passed /// Find a valid program address and its corresponding nonce which must be passed
/// as an additional seed when calling `create_program_address` /// as an additional seed when calling `create_program_address`
// #[cfg(not(feature = "program"))] // #[cfg(not(feature = "program"))]
#[allow(clippy::same_item_push)]
pub fn find_program_address(seeds: &[&[u8]], program_id: &Pubkey) -> (Pubkey, u8) { pub fn find_program_address(seeds: &[&[u8]], program_id: &Pubkey) -> (Pubkey, u8) {
let mut nonce = [255]; let mut nonce = [std::u8::MAX];
for _ in 0..std::u8::MAX { for _ in 0..std::u8::MAX {
{ {
let mut seeds_with_nonce = seeds.to_vec(); let mut seeds_with_nonce = seeds.to_vec();

View File

@ -311,6 +311,7 @@ mod test {
} }
#[test] #[test]
#[allow(clippy::same_item_push)]
fn test_parse_token() { fn test_parse_token() {
let mut keys: Vec<Pubkey> = vec![]; let mut keys: Vec<Pubkey> = vec![];
for _ in 0..10 { for _ in 0..10 {
@ -656,6 +657,7 @@ mod test {
} }
#[test] #[test]
#[allow(clippy::same_item_push)]
fn test_token_ix_not_enough_keys() { fn test_token_ix_not_enough_keys() {
let mut keys: Vec<Pubkey> = vec![]; let mut keys: Vec<Pubkey> = vec![];
for _ in 0..10 { for _ in 0..10 {