Skip to content

Commit 060209e

Browse files
jbencinjbencin
committed
chore: Fix Clippy lint iter_with_drain 
1 parent 9aea3e2 commit 060209e

File tree

14 files changed

+72
-76
lines changed

14 files changed

+72
-76
lines changed

‎stackslib/src/burnchains/tests/mod.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,13 +1035,13 @@ fn mine_10_stacks_blocks_2_forks_disjoint() {
10351035
let mut miners_1 = vec![];
10361036
let mut miners_2 = vec![];
10371037

1038-
let mut miners_drain = miners.drain(..);
1038+
let mut miners_iter = miners.into_iter();
10391039
for i in 0..5 {
1040-
let m = miners_drain.next().unwrap();
1040+
let m = miners_iter.next().unwrap();
10411041
miners_1.push(m);
10421042
}
10431043
for i in 0..5 {
1044-
let m = miners_drain.next().unwrap();
1044+
let m = miners_iter.next().unwrap();
10451045
miners_2.push(m);
10461046
}
10471047

@@ -1150,13 +1150,13 @@ fn mine_10_stacks_blocks_2_forks_disjoint_same_blocks() {
11501150
let mut miners_1 = vec![];
11511151
let mut miners_2 = vec![];
11521152

1153-
let mut miners_drain = miners.drain(..);
1153+
let mut miners_iter = miners.into_iter();
11541154
for i in 0..5 {
1155-
let m = miners_drain.next().unwrap();
1155+
let m = miners_iter.next().unwrap();
11561156
miners_1.push(m);
11571157
}
11581158
for i in 0..5 {
1159-
let m = miners_drain.next().unwrap();
1159+
let m = miners_iter.next().unwrap();
11601160
miners_2.push(m);
11611161
}
11621162

‎stackslib/src/chainstate/nakamoto/shadow.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ impl NakamotoBlockBuilder {
506506
chainstate_handle: &StacksChainState,
507507
burn_dbconn: &SortitionHandleConn,
508508
tenure_id_consensus_hash: &ConsensusHash,
509-
mut txs: Vec<StacksTransaction>,
509+
txs: Vec<StacksTransaction>,
510510
) -> Result<(NakamotoBlock, u64, ExecutionCost), Error> {
511511
use clarity::vm::ast::ASTRules;
512512

@@ -532,7 +532,7 @@ impl NakamotoBlockBuilder {
532532
&mut miner_tenure_info,
533533
tenure_id_consensus_hash,
534534
)?;
535-
for tx in txs.drain(..) {
535+
for tx in txs.into_iter() {
536536
let tx_len = tx.tx_len();
537537
match builder.try_mine_tx_with_len(
538538
&mut tenure_tx,

‎stackslib/src/chainstate/nakamoto/tests/node.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,7 +1016,7 @@ impl TestStacksNode {
10161016
mut builder: NakamotoBlockBuilder,
10171017
chainstate_handle: &StacksChainState,
10181018
burn_dbconn: &SortitionHandleConn,
1019-
mut txs: Vec<StacksTransaction>,
1019+
txs: Vec<StacksTransaction>,
10201020
) -> Result<(NakamotoBlock, u64, ExecutionCost), ChainstateError> {
10211021
use clarity::vm::ast::ASTRules;
10221022

@@ -1035,7 +1035,7 @@ impl TestStacksNode {
10351035
let mut miner_tenure_info =
10361036
builder.load_tenure_info(&mut chainstate, burn_dbconn, tenure_cause)?;
10371037
let mut tenure_tx = builder.tenure_begin(burn_dbconn, &mut miner_tenure_info)?;
1038-
for tx in txs.drain(..) {
1038+
for tx in txs.into_iter() {
10391039
let tx_len = tx.tx_len();
10401040
match builder.try_mine_tx_with_len(
10411041
&mut tenure_tx,

‎stackslib/src/chainstate/stacks/db/blocks.rs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -746,11 +746,11 @@ impl StacksChainState {
746746
blocks_conn: &DBConn,
747747
) -> Result<Vec<(ConsensusHash, BlockHeaderHash)>, Error> {
748748
let list_block_sql = "SELECT * FROM staging_blocks ORDER BY height".to_string();
749-
let mut blocks = query_rows::<StagingBlock, _>(blocks_conn, &list_block_sql, NO_PARAMS)
749+
let blocks = query_rows::<StagingBlock, _>(blocks_conn, &list_block_sql, NO_PARAMS)
750750
.map_err(Error::DBError)?;
751751

752752
Ok(blocks
753-
.drain(..)
753+
.into_iter()
754754
.map(|b| (b.consensus_hash, b.anchored_block_hash))
755755
.collect())
756756
}
@@ -767,20 +767,23 @@ impl StacksChainState {
767767
blocks_conn: &DBConn,
768768
blocks_dir: &str,
769769
) -> Result<Vec<(ConsensusHash, BlockHeaderHash, Vec<BlockHeaderHash>)>, Error> {
770-
let mut blocks = StacksChainState::list_blocks(blocks_conn)?;
770+
let blocks = StacksChainState::list_blocks(blocks_conn)?;
771771
let mut ret = vec![];
772772

773-
for (consensus_hash, block_hash) in blocks.drain(..) {
773+
for (consensus_hash, block_hash) in blocks.into_iter() {
774774
let list_microblock_sql = "SELECT * FROM staging_microblocks WHERE anchored_block_hash = ?1 AND consensus_hash = ?2 ORDER BY sequence".to_string();
775775
let list_microblock_args = params![block_hash, consensus_hash];
776-
let mut microblocks = query_rows::<StagingMicroblock, _>(
776+
let microblocks = query_rows::<StagingMicroblock, _>(
777777
blocks_conn,
778778
&list_microblock_sql,
779779
list_microblock_args,
780780
)
781781
.map_err(Error::DBError)?;
782782

783-
let microblock_hashes = microblocks.drain(..).map(|mb| mb.microblock_hash).collect();
783+
let microblock_hashes = microblocks
784+
.into_iter()
785+
.map(|mb| mb.microblock_hash)
786+
.collect();
784787
ret.push((consensus_hash, block_hash, microblock_hashes));
785788
}
786789

‎stackslib/src/chainstate/stacks/index/test/marf.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1351,7 +1351,7 @@ fn marf_insert_random_10485760_4096_file_storage() {
13511351
start_time = get_epoch_time_ms();
13521352

13531353
let values = values
1354-
.drain(..)
1354+
.into_iter()
13551355
.map(|x| MARFValue::from_value(&x))
13561356
.collect();
13571357

@@ -1772,7 +1772,7 @@ fn marf_insert_get_128_fork_256() {
17721772
}
17731773

17741774
let values = values
1775-
.drain(..)
1775+
.into_iter()
17761776
.map(|x| MARFValue::from_value(&x))
17771777
.collect();
17781778

‎stackslib/src/chainstate/stacks/miner.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2073,15 +2073,15 @@ impl StacksBlockBuilder {
20732073
mut builder: StacksBlockBuilder,
20742074
chainstate_handle: &StacksChainState,
20752075
burn_dbconn: &SortitionHandleConn,
2076-
mut txs: Vec<StacksTransaction>,
2076+
txs: Vec<StacksTransaction>,
20772077
mut mblock_txs: Vec<StacksTransaction>,
20782078
) -> Result<(StacksBlock, u64, ExecutionCost, Option<StacksMicroblock>), Error> {
20792079
debug!("Build anchored block from {} transactions", txs.len());
20802080
let (mut chainstate, _) = chainstate_handle.reopen()?;
20812081
let mut miner_epoch_info = builder.pre_epoch_begin(&mut chainstate, burn_dbconn, true)?;
20822082
let ast_rules = miner_epoch_info.ast_rules;
20832083
let (mut epoch_tx, _) = builder.epoch_begin(burn_dbconn, &mut miner_epoch_info)?;
2084-
for tx in txs.drain(..) {
2084+
for tx in txs.into_iter() {
20852085
match builder.try_mine_tx(&mut epoch_tx, &tx, ast_rules.clone()) {
20862086
Ok(_) => {
20872087
debug!("Included {}", &tx.txid());

‎stackslib/src/chainstate/stacks/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1572,7 +1572,7 @@ pub mod test {
15721572

15731573
tx_coinbase.anchor_mode = TransactionAnchorMode::OnChainOnly;
15741574

1575-
let mut all_txs = codec_all_transactions(
1575+
let all_txs = codec_all_transactions(
15761576
&TransactionVersion::Testnet,
15771577
0x80000000,
15781578
&TransactionAnchorMode::OnChainOnly,
@@ -1589,7 +1589,7 @@ pub mod test {
15891589
txs_anchored.push(tx_coinbase);
15901590
}
15911591

1592-
for tx in all_txs.drain(..) {
1592+
for tx in all_txs.into_iter() {
15931593
match tx.payload {
15941594
TransactionPayload::Coinbase(..) => {
15951595
continue;

‎stackslib/src/core/tests/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1397,7 +1397,7 @@ fn mempool_db_load_store_replace_tx(#[case] behavior: MempoolCollectionBehavior)
13971397
let chainstate_path = chainstate_path(&path_name);
13981398
let mut mempool = MemPoolDB::open_test(false, 0x80000000, &chainstate_path).unwrap();
13991399

1400-
let mut txs = codec_all_transactions(
1400+
let txs = codec_all_transactions(
14011401
&TransactionVersion::Testnet,
14021402
0x80000000,
14031403
&TransactionAnchorMode::Any,
@@ -1409,7 +1409,7 @@ fn mempool_db_load_store_replace_tx(#[case] behavior: MempoolCollectionBehavior)
14091409
let mut mempool_tx = mempool.tx_begin().unwrap();
14101410

14111411
eprintln!("add all txs");
1412-
for (i, mut tx) in txs.drain(..).enumerate() {
1412+
for (i, mut tx) in txs.into_iter().enumerate() {
14131413
// make sure each address is unique per tx (not the case in codec_all_transactions)
14141414
let origin_address = StacksAddress {
14151415
version: 22,

‎stackslib/src/net/dns.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ impl DNSClient {
277277
to_remove.push(req.clone());
278278
}
279279
}
280-
for req in to_remove.drain(..) {
280+
for req in to_remove.into_iter() {
281281
self.requests.insert(
282282
req.clone(),
283283
Some(DNSResponse::error(req, "DNS lookup timed out".to_string())),

‎stackslib/src/net/download/epoch2x.rs

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -327,14 +327,14 @@ impl BlockDownloader {
327327
&mut self,
328328
pox_id: &PoxId,
329329
dns_client: &mut DNSClient,
330-
mut urls: Vec<UrlString>,
330+
urls: Vec<UrlString>,
331331
) -> Result<(), net_error> {
332332
assert_eq!(self.state, BlockDownloaderState::DNSLookupBegin);
333333

334334
// optimistic concurrency control: remember the current PoX Id
335335
self.pox_id = pox_id.clone();
336336
self.dns_lookups.clear();
337-
for url_str in urls.drain(..) {
337+
for url_str in urls.into_iter() {
338338
if url_str.len() == 0 {
339339
continue;
340340
}
@@ -1214,7 +1214,7 @@ impl PeerNetwork {
12141214
start_sortition_height + scan_batch_size
12151215
);
12161216

1217-
let mut availability =
1217+
let availability =
12181218
PeerNetwork::with_inv_state(self, |ref mut network, ref mut inv_state| {
12191219
BlockDownloader::get_block_availability(
12201220
&network.local_peer,
@@ -1240,7 +1240,7 @@ impl PeerNetwork {
12401240
);
12411241

12421242
for (i, (consensus_hash, block_hash_opt, mut neighbors)) in
1243-
availability.drain(..).enumerate()
1243+
availability.into_iter().enumerate()
12441244
{
12451245
test_debug!(
12461246
"{:?}: consider availability of {}/{:?}",
@@ -1255,11 +1255,8 @@ impl PeerNetwork {
12551255
break;
12561256
}
12571257

1258-
let block_hash = match block_hash_opt {
1259-
Some(h) => h,
1260-
None => {
1261-
continue;
1262-
}
1258+
let Some(block_hash) = block_hash_opt else {
1259+
continue;
12631260
};
12641261

12651262
let mut parent_block_header_opt = None;
@@ -1450,16 +1447,13 @@ impl PeerNetwork {
14501447
(&mut neighbors[..]).shuffle(&mut thread_rng());
14511448

14521449
let mut requests = VecDeque::new();
1453-
for nk in neighbors.drain(..) {
1454-
let data_url = match self.get_data_url(&nk) {
1455-
Some(url) => url,
1456-
None => {
1457-
debug!(
1458-
"{:?}: Unable to request {} from {}: no data URL",
1459-
&self.local_peer, &target_index_block_hash, &nk
1460-
);
1461-
continue;
1462-
}
1450+
for nk in neighbors.into_iter() {
1451+
let Some(data_url) = self.get_data_url(&nk) else {
1452+
debug!(
1453+
"{:?}: Unable to request {} from {}: no data URL",
1454+
&self.local_peer, &target_index_block_hash, &nk
1455+
);
1456+
continue;
14631457
};
14641458
if data_url.len() == 0 {
14651459
// peer doesn't yet know its public IP address, and isn't given a data URL
@@ -1983,9 +1977,9 @@ impl PeerNetwork {
19831977
pub fn block_getblocks_begin(&mut self) -> Result<(), net_error> {
19841978
test_debug!("{:?}: block_getblocks_begin", &self.local_peer);
19851979
PeerNetwork::with_downloader_state(self, |ref mut network, ref mut downloader| {
1986-
let mut priority = PeerNetwork::prioritize_requests(&downloader.blocks_to_try);
1980+
let priority = PeerNetwork::prioritize_requests(&downloader.blocks_to_try);
19871981
let mut requests = HashMap::new();
1988-
for sortition_height in priority.drain(..) {
1982+
for sortition_height in priority.into_iter() {
19891983
match downloader.blocks_to_try.get_mut(&sortition_height) {
19901984
Some(ref mut keys) => {
19911985
match PeerNetwork::begin_request(network, &downloader.dns_lookups, keys) {
@@ -2021,9 +2015,9 @@ impl PeerNetwork {
20212015
pub fn block_getmicroblocks_begin(&mut self) -> Result<(), net_error> {
20222016
test_debug!("{:?}: block_getmicroblocks_begin", &self.local_peer);
20232017
PeerNetwork::with_downloader_state(self, |ref mut network, ref mut downloader| {
2024-
let mut priority = PeerNetwork::prioritize_requests(&downloader.microblocks_to_try);
2018+
let priority = PeerNetwork::prioritize_requests(&downloader.microblocks_to_try);
20252019
let mut requests = HashMap::new();
2026-
for sortition_height in priority.drain(..) {
2020+
for sortition_height in priority.into_iter() {
20272021
match downloader.microblocks_to_try.get_mut(&sortition_height) {
20282022
Some(ref mut keys) => {
20292023
match PeerNetwork::begin_request(network, &downloader.dns_lookups, keys) {
@@ -2192,11 +2186,11 @@ impl PeerNetwork {
21922186
}
21932187
}
21942188

2195-
for height in blocks_empty.drain(..) {
2189+
for height in blocks_empty.into_iter() {
21962190
downloader.blocks_to_try.remove(&height);
21972191
}
21982192

2199-
for height in microblocks_empty.drain(..) {
2193+
for height in microblocks_empty.into_iter() {
22002194
downloader.microblocks_to_try.remove(&height);
22012195
}
22022196

0 commit comments

Comments
 (0)