Skip to content

Commit c0a82f2

Browse files
Pierre Chevalierfacebook-github-bot
Pierre Chevalier
authored andcommitted
Remove useless into_iter() calls
Summary: In Rust 1.68.0, the `useless_conversion` clippy lint [got smarter](rust-lang/rust-clippy#10020). Fix all instances of that lint in Mononoke. Reviewed By: markbt Differential Revision: D44378069 fbshipit-source-id: acfd6c77c6a400830c378b4040661323e7232441
1 parent bf06e59 commit c0a82f2

File tree

13 files changed

+8
-36
lines changed

13 files changed

+8
-36
lines changed

eden/mononoke/blobrepo/blobrepo_hg/src/create_changeset.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ impl CreateChangeset {
333333
// update changeset mapping
334334
let completion_record = ChangesetInsert {
335335
cs_id: bonsai_cs.get_changeset_id(),
336-
parents: bonsai_cs.parents().into_iter().collect(),
336+
parents: bonsai_cs.parents().collect(),
337337
};
338338
complete_changesets
339339
.add(&ctx, completion_record)

eden/mononoke/blobstore/sqlblob/src/lib.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -243,10 +243,7 @@ impl Sqlblob {
243243

244244
let config_handle = get_gc_config_handle(config_store)?;
245245

246-
let futs: FuturesOrdered<_> = (0..shard_count)
247-
.into_iter()
248-
.map(connection_factory)
249-
.collect();
246+
let futs: FuturesOrdered<_> = (0..shard_count).map(connection_factory).collect();
250247

251248
let shard_connections = futs.try_collect::<Vec<_>>().await?;
252249
let mut write_connections = Vec::with_capacity(shard_count);

eden/mononoke/blobstore/virtually_sharded_blobstore/src/shard.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,7 @@ pub struct Shards {
5252

5353
impl Shards {
5454
pub fn new(shard_count: NonZeroUsize, perf_counter_type: PerfCounterType) -> Self {
55-
let semaphores = (0..shard_count.get())
56-
.into_iter()
57-
.map(|_| Semaphore::new(1))
58-
.collect();
55+
let semaphores = (0..shard_count.get()).map(|_| Semaphore::new(1)).collect();
5956

6057
Self {
6158
semaphores,

eden/mononoke/changesets/changesets_creation/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ pub async fn save_changesets(
8484
let bcs_id = bcs.get_changeset_id();
8585
let completion_record = ChangesetInsert {
8686
cs_id: bcs_id,
87-
parents: bcs.parents().into_iter().collect(),
87+
parents: bcs.parents().collect(),
8888
};
8989
bonsai_complete_futs.push(complete_changesets.add(ctx, completion_record));
9090
}

eden/mononoke/cmds/blobstore_healer/wal_healer/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ impl WalHealer {
182182
let unique_blobstore_keys = queue_entries
183183
.iter()
184184
.unique_by(|entry| entry.blobstore_key.clone())
185-
.into_iter()
186185
.count();
187186

188187
let healing_futures: Vec<(_, u64)> = queue_entries

eden/mononoke/cmds/rechunker.rs

-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ fn main(fb: FacebookInit) -> Result<(), Error> {
6464
let filenode_ids: Vec<_> = matches
6565
.values_of("filenodes")
6666
.unwrap()
67-
.into_iter()
6867
.map(|f| {
6968
HgNodeHash::from_str(f)
7069
.map(HgFileNodeId::new)

eden/mononoke/hooks/src/rust_hooks/limit_commit_message_length.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ fn extract_title<'a>(message: &'a str, max_length: usize) -> &'a str {
9494
message
9595
};
9696

97-
message.split('\n').into_iter().next().unwrap_or("")
97+
message.split('\n').next().unwrap_or("")
9898
}
9999

100100
#[cfg(test)]

eden/mononoke/megarepo_api/commit_transformation/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ pub fn create_directory_source_to_target_multi_mover(
132132
let override_prefix_src = MPath::new(override_prefix_src.clone())?;
133133
if override_prefix_src.is_prefix_of(mpath_element_iter(path)) {
134134
let suffix: Vec<_> = mpath_element_iter(path)
135-
.into_iter()
136135
.skip(override_prefix_src.num_components())
137136
.collect();
138137

eden/mononoke/mononoke_api/src/test/test_repo.rs

-6
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,6 @@ async fn tree_list(fb: FacebookInit) -> Result<(), Error> {
872872
let tree = path.tree().await?.unwrap();
873873
tree.list()
874874
.await?
875-
.into_iter()
876875
.map(|(name, _entry)| name)
877876
.collect::<Vec<_>>()
878877
},
@@ -889,7 +888,6 @@ async fn tree_list(fb: FacebookInit) -> Result<(), Error> {
889888
let tree = path.tree().await?.unwrap();
890889
tree.list()
891890
.await?
892-
.into_iter()
893891
.map(|(name, _entry)| name)
894892
.collect::<Vec<_>>()
895893
},
@@ -907,7 +905,6 @@ async fn tree_list(fb: FacebookInit) -> Result<(), Error> {
907905
{
908906
tree.list()
909907
.await?
910-
.into_iter()
911908
.map(|(name, _entry)| name)
912909
.collect::<Vec<_>>()
913910
},
@@ -920,7 +917,6 @@ async fn tree_list(fb: FacebookInit) -> Result<(), Error> {
920917
match tree
921918
.list()
922919
.await?
923-
.into_iter()
924920
.collect::<HashMap<_, _>>()
925921
.get("subsubdir2")
926922
.expect("entry should exist for subsubdir2")
@@ -935,7 +931,6 @@ async fn tree_list(fb: FacebookInit) -> Result<(), Error> {
935931
let tree = path.tree().await?.unwrap();
936932
tree.list()
937933
.await?
938-
.into_iter()
939934
.map(|(name, entry)| match entry {
940935
TreeEntry::File(file) => {
941936
Some((name, file.size(), file.content_sha1().to_string()))
@@ -956,7 +951,6 @@ async fn tree_list(fb: FacebookInit) -> Result<(), Error> {
956951
let tree = repo.tree(subsubdir2_id).await?.expect("tree exists");
957952
tree.list()
958953
.await?
959-
.into_iter()
960954
.map(|(name, _entry)| name)
961955
.collect::<Vec<_>>()
962956
},

eden/mononoke/newfilenodes/src/shards.rs

-2
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,10 @@ pub struct Shards {
3434
impl Shards {
3535
pub fn new(filenodes_concurrency: usize, history_concurrency: usize) -> Self {
3636
let filenodes = (0..filenodes_concurrency)
37-
.into_iter()
3837
.map(|_| Semaphore::new(1))
3938
.collect();
4039

4140
let history = (0..history_concurrency)
42-
.into_iter()
4341
.map(|_| Semaphore::new(1))
4442
.collect();
4543

eden/mononoke/newfilenodes/src/test/test_reader.rs

-1
Original file line numberDiff line numberDiff line change
@@ -980,7 +980,6 @@ fn create_unsharded() -> Result<Vec1<Connection>, Error> {
980980

981981
fn create_sharded() -> Result<Vec1<Connection>, Error> {
982982
Ok((0..16)
983-
.into_iter()
984983
.map(|_| build_shard())
985984
.collect::<Result<Vec<_>, Error>>()?
986985
.try_into()?)

eden/mononoke/scs_server/src/methods/repo.rs

-1
Original file line numberDiff line numberDiff line change
@@ -758,7 +758,6 @@ impl SourceControlServiceImpl {
758758
)
759759
.await?;
760760
let cs_ids = std::iter::zip(params.commits, changesets)
761-
.into_iter()
762761
.map(|(commit, cs)| {
763762
cs.map(|cs| cs.id())
764763
.ok_or_else(|| errors::commit_not_found(commit.to_string()))

eden/mononoke/tools/admin/src/commands/commit/split.rs

+3-12
Original file line numberDiff line numberDiff line change
@@ -286,20 +286,11 @@ mod test {
286286

287287
let bcs = split[0].load(&ctx, repo.repo_blobstore()).await?;
288288
let parents: Vec<ChangesetId> = vec![];
289-
assert_eq!(
290-
parents,
291-
bcs.parents().into_iter().collect::<Vec<ChangesetId>>()
292-
);
289+
assert_eq!(parents, bcs.parents().collect::<Vec<ChangesetId>>());
293290
let bcs = split[1].load(&ctx, repo.repo_blobstore()).await?;
294-
assert_eq!(
295-
vec![split[0]],
296-
bcs.parents().into_iter().collect::<Vec<_>>()
297-
);
291+
assert_eq!(vec![split[0]], bcs.parents().collect::<Vec<_>>());
298292
let bcs = split[2].load(&ctx, repo.repo_blobstore()).await?;
299-
assert_eq!(
300-
vec![split[1]],
301-
bcs.parents().into_iter().collect::<Vec<_>>()
302-
);
293+
assert_eq!(vec![split[1]], bcs.parents().collect::<Vec<_>>());
303294
}
304295

305296
// Now split by file size

0 commit comments

Comments
 (0)