solana-labs · Lichtso · Aug 24, 2023 · Aug 24, 2023 · Aug 24, 2023 · Aug 24, 2023
diff --git a/accounts-db/src/account_storage.rs b/accounts-db/src/account_storage.rs
@@ -103,7 +103,7 @@ impl AccountStorage {
     pub fn initialize(&mut self, all_storages: AccountStorageMap) {
         assert!(self.map.is_empty());
         assert!(self.no_shrink_in_progress());
-        self.map.extend(all_storages.into_iter())
+        self.map.extend(all_storages)
     }
 
     /// remove the append vec at 'slot'

diff --git a/accounts-db/src/accounts_db.rs b/accounts-db/src/accounts_db.rs
@@ -3487,8 +3487,7 @@ impl AccountsDb {
 
         let (reclaims, pubkeys_removed_from_accounts_index2) =
             self.purge_keys_exact(pubkey_to_slot_set.iter());
-        pubkeys_removed_from_accounts_index
-            .extend(pubkeys_removed_from_accounts_index2.into_iter());
+        pubkeys_removed_from_accounts_index.extend(pubkeys_removed_from_accounts_index2);
 
         // Don't reset from clean, since the pubkeys in those stores may need to be unref'ed
         // and those stores may be used for background hashing.
@@ -7358,7 +7357,7 @@ impl AccountsDb {
                 let mut sort_time = Measure::start("sort_storages");
                 let min_root = self.accounts_index.min_alive_root();
                 let storages = SortedStorages::new_with_slots(
-                    combined_maps.iter().zip(slots.into_iter()),
+                    combined_maps.iter().zip(slots),
                     min_root,
                     Some(slot),
                 );
@@ -7824,7 +7823,7 @@ impl AccountsDb {
             let (storages, slots) =
                 self.get_snapshot_storages(base_slot.checked_add(1).unwrap()..=slot);
             let sorted_storages =
-                SortedStorages::new_with_slots(storages.iter().zip(slots.into_iter()), None, None);
+                SortedStorages::new_with_slots(storages.iter().zip(slots), None, None);
             let calculated_incremental_accounts_hash = self.calculate_incremental_accounts_hash(
                 &calc_config,
                 &sorted_storages,

diff --git a/accounts-db/src/append_vec.rs b/accounts-db/src/append_vec.rs
@@ -427,7 +427,7 @@ impl AppendVec {
         Some((
             //UNSAFE: This unsafe creates a slice that represents a chunk of self.map memory
             //The lifetime of this slice is tied to &self, since it points to self.map memory
-            unsafe { std::slice::from_raw_parts(data.as_ptr() as *const u8, size) },
+            unsafe { std::slice::from_raw_parts(data.as_ptr(), size) },
             next,
         ))
     }
@@ -615,7 +615,7 @@ impl AppendVec {
             let ptrs = [
                 (meta_ptr as *const u8, mem::size_of::<StoredMeta>()),
                 (account_meta_ptr as *const u8, mem::size_of::<AccountMeta>()),
-                (hash_ptr as *const u8, mem::size_of::<Hash>()),
+                (hash_ptr, mem::size_of::<Hash>()),
                 (data_ptr, data_len),
             ];
             if let Some(res) = self.append_ptrs_locked(&mut offset, &ptrs) {

diff --git a/accounts-db/src/sorted_storages.rs b/accounts-db/src/sorted_storages.rs
@@ -67,7 +67,7 @@ impl<'a> SortedStorages<'a> {
         let slots = source.iter().map(|storage| {
             storage.slot() // this must be unique. Will be enforced in new_with_slots
         });
-        Self::new_with_slots(source.iter().zip(slots.into_iter()), None, None)
+        Self::new_with_slots(source.iter().zip(slots), None, None)
     }
 
     /// create [`SortedStorages`] from `source` iterator.

diff --git a/accounts-db/src/tiered_storage/mmap_utils.rs b/accounts-db/src/tiered_storage/mmap_utils.rs
@@ -31,7 +31,7 @@ pub fn get_slice(map: &Mmap, offset: usize, size: usize) -> std::io::Result<(&[u
     }
     let data = &map[offset..next];
     let next = u64_align!(next);
-    let ptr = data.as_ptr() as *const u8;
+    let ptr = data.as_ptr();
 
     Ok((unsafe { std::slice::from_raw_parts(ptr, size) }, next))
 }
diff --git a/bucket_map/src/bucket_storage.rs b/bucket_map/src/bucket_storage.rs
@@ -409,7 +409,7 @@ impl<O: BucketOccupied> BucketStorage<O> {
 
                 unsafe {
                     let dst = dst_slice.as_ptr() as *mut u8;
-                    let src = src_slice.as_ptr() as *const u8;
+                    let src = src_slice.as_ptr();
                     std::ptr::copy_nonoverlapping(src, dst, old_bucket.cell_size as usize);
                 };
             }

diff --git a/cli-output/src/cli_output.rs b/cli-output/src/cli_output.rs
@@ -2385,7 +2385,7 @@ pub fn return_signers_data(tx: &Transaction, config: &ReturnSignersConfig) -> Cl
     tx.signatures
         .iter()
         .zip(tx.message.account_keys.iter())
-        .zip(verify_results.into_iter())
+        .zip(verify_results)
         .for_each(|((sig, key), res)| {
             if res {
                 signers.push(format!("{key}={sig}"))

diff --git a/cli/src/cluster_query.rs b/cli/src/cluster_query.rs
@@ -1980,7 +1980,7 @@ pub fn process_show_validators(
 
     let validators: Vec<_> = current_validators
         .into_iter()
-        .chain(delinquent_validators.into_iter())
+        .chain(delinquent_validators)
         .collect();
 
     let (average_skip_rate, average_stake_weighted_skip_rate) = {

diff --git a/cli/src/vote.rs b/cli/src/vote.rs
@@ -1385,7 +1385,7 @@ pub fn process_close_vote_account(
     if let Some(vote_account) = vote_account_status
         .current
         .into_iter()
-        .chain(vote_account_status.delinquent.into_iter())
+        .chain(vote_account_status.delinquent)
         .next()
     {
         if vote_account.activated_stake != 0 {

diff --git a/core/src/shred_fetch_stage.rs b/core/src/shred_fetch_stage.rs
@@ -208,7 +208,7 @@ impl ShredFetchStage {
             turbine_disabled.clone(),
         );
 
-        tvu_threads.extend(repair_receiver.into_iter());
+        tvu_threads.extend(repair_receiver);
         tvu_threads.push(tvu_filter);
         tvu_threads.push(repair_handler);
 

diff --git a/gossip/src/cluster_info_metrics.rs b/gossip/src/cluster_info_metrics.rs
@@ -676,7 +676,7 @@ pub(crate) fn submit_gossip_stats(
         .pull
         .votes
         .into_iter()
-        .chain(crds_stats.push.votes.into_iter())
+        .chain(crds_stats.push.votes)
         .into_grouping_map()
         .aggregate(|acc, _slot, num_votes| Some(acc.unwrap_or_default() + num_votes));
     submit_vote_stats("cluster_info_crds_stats_votes", &votes);

diff --git a/gossip/src/contact_info.rs b/gossip/src/contact_info.rs
@@ -527,9 +527,7 @@ fn sanitize_entries(addrs: &[IpAddr], sockets: &[SocketEntry]) -> Result<(), Err
     // Verify that port offsets don't overflow.
     if sockets
         .iter()
-        .fold(Some(0u16), |offset, entry| {
-            offset?.checked_add(entry.offset)
-        })
+        .try_fold(0u16, |offset, entry| offset.checked_add(entry.offset))
         .is_none()
     {
         return Err(Error::PortOffsetsOverflow);

diff --git a/ledger-tool/src/program.rs b/ledger-tool/src/program.rs
@@ -177,7 +177,7 @@ impl ProgramSubCommand for App<'_, '_> {
                 .arg(
                     Arg::with_name("input")
                         .help(
-                            r##"Input for the program to run on, where FILE is a name of a JSON file
+                            r#"Input for the program to run on, where FILE is a name of a JSON file
 with input data, or BYTES is the number of 0-valued bytes to allocate for program parameters"
 
 The input data for a program execution have to be in JSON format
@@ -196,7 +196,7 @@ and the following fields are required
     ],
     "instruction_data": [31, 32, 23, 24]
 }
-"##,
+"#,
                         )
                         .short("i")
                         .long("input")

diff --git a/local-cluster/src/cluster_tests.rs b/local-cluster/src/cluster_tests.rs
@@ -516,7 +516,7 @@ pub fn start_gossip_voter(
                 let (labels, votes) = cluster_info.get_votes_with_labels(&mut cursor);
                 let mut parsed_vote_iter: Vec<_> = labels
                     .into_iter()
-                    .zip(votes.into_iter())
+                    .zip(votes)
                     .filter_map(&vote_filter)
                     .collect();
 

diff --git a/merkle-tree/src/merkle_tree.rs b/merkle-tree/src/merkle_tree.rs
@@ -58,7 +58,7 @@ impl<'a> Proof<'a> {
                 None
             }
         });
-        matches!(result, Some(_))
+        result.is_some()
     }
 }
 

diff --git a/metrics/src/metrics.rs b/metrics/src/metrics.rs
@@ -527,10 +527,7 @@ pub mod test_mocks {
             assert!(!points.is_empty());
 
             let new_points = points.len();
-            self.points_written
-                .lock()
-                .unwrap()
-                .extend(points.into_iter());
+            self.points_written.lock().unwrap().extend(points);
 
             info!(
                 "Writing {} points ({} total)",

diff --git a/programs/bpf_loader/src/lib.rs b/programs/bpf_loader/src/lib.rs
@@ -332,7 +332,7 @@ fn create_memory_mapping<'a, 'b, C: ContextObject>(
         MemoryRegion::new_writable(heap.as_slice_mut(), MM_HEAP_START),
     ]
     .into_iter()
-    .chain(additional_regions.into_iter())
+    .chain(additional_regions)
     .collect();
 
     Ok(if let Some(cow_cb) = cow_cb {

diff --git a/programs/bpf_loader/src/syscalls/mem_ops.rs b/programs/bpf_loader/src/syscalls/mem_ops.rs
@@ -196,13 +196,7 @@ fn memmove_non_contiguous(
         memory_mapping,
         reverse,
         |src_host_addr, dst_host_addr, chunk_len| {
-            unsafe {
-                std::ptr::copy(
-                    src_host_addr as *const u8,
-                    dst_host_addr as *mut u8,
-                    chunk_len,
-                )
-            };
+            unsafe { std::ptr::copy(src_host_addr, dst_host_addr as *mut u8, chunk_len) };
             Ok(0)
         },
     )
@@ -237,8 +231,8 @@ fn memcmp_non_contiguous(
         false,
         |s1_addr, s2_addr, chunk_len| {
             let res = unsafe {
-                let s1 = slice::from_raw_parts(s1_addr as *const u8, chunk_len);
-                let s2 = slice::from_raw_parts(s2_addr as *const u8, chunk_len);
+                let s1 = slice::from_raw_parts(s1_addr, chunk_len);
+                let s2 = slice::from_raw_parts(s2_addr, chunk_len);
                 // Safety:
                 // memcmp is marked unsafe since it assumes that s1 and s2 are exactly chunk_len
                 // long. The whole point of iter_memory_pair_chunks is to find same length chunks

diff --git a/programs/bpf_loader/src/syscalls/mod.rs b/programs/bpf_loader/src/syscalls/mod.rs
@@ -1738,23 +1738,23 @@ declare_syscall!(
 
         let base = translate_slice::<u8>(
             memory_mapping,
-            params.base as *const _ as *const u8 as u64,
+            params.base as *const _ as u64,
             params.base_len,
             invoke_context.get_check_aligned(),
             invoke_context.get_check_size(),
         )?;
 
         let exponent = translate_slice::<u8>(
             memory_mapping,
-            params.exponent as *const _ as *const u8 as u64,
+            params.exponent as *const _ as u64,
             params.exponent_len,
             invoke_context.get_check_aligned(),
             invoke_context.get_check_size(),
         )?;
 
         let modulus = translate_slice::<u8>(
             memory_mapping,
-            params.modulus as *const _ as *const u8 as u64,
+            params.modulus as *const _ as u64,
             params.modulus_len,
             invoke_context.get_check_aligned(),
             invoke_context.get_check_size(),

diff --git a/programs/stake/src/config.rs b/programs/stake/src/config.rs
@@ -1,12 +1,12 @@
 //! config for staking
 //!  carries variables that the stake program cares about
+#[allow(deprecated)]
+use solana_sdk::stake::config;
 #[deprecated(
     since = "1.8.0",
     note = "Please use `solana_sdk::stake::config` or `solana_program::stake::config` instead"
 )]
 pub use solana_sdk::stake::config::*;
-#[allow(deprecated)]
-use solana_sdk::stake::config::{self, Config};
 use {
     bincode::deserialize,
     solana_config_program::{create_config_account, get_config_data},

diff --git a/programs/vote/src/vote_state/mod.rs b/programs/vote/src/vote_state/mod.rs
@@ -5,7 +5,7 @@ use {
     log::*,
     serde_derive::{Deserialize, Serialize},
     solana_metrics::datapoint_debug,
-    solana_program::vote::{error::VoteError, program::id, state::serde_compact_vote_state_update},
+    solana_program::vote::{error::VoteError, program::id},
     solana_sdk::{
         account::{AccountSharedData, ReadableAccount, WritableAccount},
         clock::{Epoch, Slot, UnixTimestamp},

diff --git a/runtime/src/serde_snapshot.rs b/runtime/src/serde_snapshot.rs
@@ -176,7 +176,7 @@ impl<T> SnapshotAccountsDbFields<T> {
                     })?;
 
                 let mut combined_storages = full_snapshot_storages;
-                combined_storages.extend(incremental_snapshot_storages.into_iter());
+                combined_storages.extend(incremental_snapshot_storages);
 
                 Ok(AccountsDbFields(
                     combined_storages,

diff --git a/runtime/src/snapshot_bank_utils.rs b/runtime/src/snapshot_bank_utils.rs
@@ -300,7 +300,7 @@ pub fn bank_from_snapshot_archives(
     if let Some(ref mut unarchive_preparation_result) = unarchived_incremental_snapshot {
         let incremental_snapshot_storages =
             std::mem::take(&mut unarchive_preparation_result.storage);
-        storage.extend(incremental_snapshot_storages.into_iter());
+        storage.extend(incremental_snapshot_storages);
     }
 
     let storage_and_next_append_vec_id = StorageAndNextAppendVecId {

diff --git a/stake-accounts/src/stake_accounts.rs b/stake-accounts/src/stake_accounts.rs
@@ -138,7 +138,7 @@ fn move_stake_account(
         new_withdraw_authority_pubkey,
     );
 
-    instructions.extend(authorize_instructions.into_iter());
+    instructions.extend(authorize_instructions);
     let message = Message::new(&instructions, Some(fee_payer_pubkey));
     Some(message)
 }

diff --git a/storage-bigtable/src/compression.rs b/storage-bigtable/src/compression.rs
@@ -48,28 +48,24 @@ pub fn decompress(data: &[u8]) -> Result<Vec<u8>, io::Error> {
 
 pub fn compress(method: CompressionMethod, data: &[u8]) -> Result<Vec<u8>, io::Error> {
     let mut compressed_data = bincode::serialize(&method).unwrap();
-    compressed_data.extend(
-        match method {
-            CompressionMethod::Bzip2 => {
-                let mut e = bzip2::write::BzEncoder::new(Vec::new(), bzip2::Compression::best());
-                e.write_all(data)?;
-                e.finish()?
-            }
-            CompressionMethod::Gzip => {
-                let mut e =
-                    flate2::write::GzEncoder::new(Vec::new(), flate2::Compression::default());
-                e.write_all(data)?;
-                e.finish()?
-            }
-            CompressionMethod::Zstd => {
-                let mut e = zstd::stream::write::Encoder::new(Vec::new(), 0).unwrap();
-                e.write_all(data)?;
-                e.finish()?
-            }
-            CompressionMethod::NoCompression => data.to_vec(),
+    compressed_data.extend(match method {
+        CompressionMethod::Bzip2 => {
+            let mut e = bzip2::write::BzEncoder::new(Vec::new(), bzip2::Compression::best());
+            e.write_all(data)?;
+            e.finish()?
         }
-        .into_iter(),
-    );
+        CompressionMethod::Gzip => {
+            let mut e = flate2::write::GzEncoder::new(Vec::new(), flate2::Compression::default());
+            e.write_all(data)?;
+            e.finish()?
+        }
+        CompressionMethod::Zstd => {
+            let mut e = zstd::stream::write::Encoder::new(Vec::new(), 0).unwrap();
+            e.write_all(data)?;
+            e.finish()?
+        }
+        CompressionMethod::NoCompression => data.to_vec(),
+    });
 
     Ok(compressed_data)
 }

diff --git a/storage-proto/build.rs b/storage-proto/build.rs
@@ -10,7 +10,7 @@ fn main() -> Result<(), std::io::Error> {
     let mut protos = Vec::new();
     for proto_file in &proto_files {
         let proto = proto_base_path.join(proto_file);
-        println!("cargo::rerun-if-changed={}", proto.display());
+        println!("cargo:rerun-if-changed={}", proto.display());
         protos.push(proto);
     }
 

diff --git a/validator/src/admin_rpc_service.rs b/validator/src/admin_rpc_service.rs
@@ -485,7 +485,7 @@ impl AdminRpc for AdminRpcImpl {
             .staked_map_id;
         let mut write_staked_nodes = meta.staked_nodes_overrides.write().unwrap();
         write_staked_nodes.clear();
-        write_staked_nodes.extend(loaded_config.into_iter());
+        write_staked_nodes.extend(loaded_config);
         info!("Staked nodes overrides loaded from {}", path);
         debug!("overrides map: {:?}", write_staked_nodes);
         Ok(())

diff --git a/validator/src/main.rs b/validator/src/main.rs
@@ -1450,7 +1450,7 @@ pub fn main() {
         if let Some(account_shrink_snapshot_paths) = account_shrink_snapshot_paths {
             account_snapshot_paths
                 .into_iter()
-                .chain(account_shrink_snapshot_paths.into_iter())
+                .chain(account_shrink_snapshot_paths)
                 .collect()
         } else {
             account_snapshot_paths
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,7 +58,7 @@ impl<'a> Proof<'a> { @@
                     None
                 }
             });
-            matches!(result, Some(_))
+            result.is_some()
         }
     }
@@ Expand Down @@