Skip to content

Commit 194de6d

Browse files
mitrandir77facebook-github-bot
authored andcommitted
fix lint warning after Rust update
Summary: We are now using Rust 1.81.0. The new lint warning: ``` warning: this function depends on never type fallback being `()` ``` Forces us to use explicit types in `try_collect` when we're collecting over fuctions returning unit types. (Previously that was a never type which was implicitly casted to unit type). More context: rust-lang/rust#123748 Reviewed By: diliop Differential Revision: D64007786 fbshipit-source-id: e7da6827b799053a4a37247e80ccf9f36636d20a
1 parent 5a8ebf3 commit 194de6d

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

eden/mononoke/blobstore/packblob/src/store.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ impl<T: Blobstore + BlobstoreUnlinkOps> PackBlob<T> {
226226
let key = format!("{}{}{}", key_prefix, key, ENVELOPE_SUFFIX);
227227
links.push(self.inner.copy(ctx, &pack_key, key));
228228
}
229-
links.try_collect().await?;
229+
links.try_collect::<()>().await?;
230230

231231
// remove the pack key, so that only the entries links are keeping it live
232232
self.inner.unlink(ctx, &pack_key).await?;

eden/mononoke/commit_rewriting/cross_repo_sync/src/git_submodules/validation.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ where
787787
}
788788
})
789789
.buffer_unordered(100)
790-
.try_collect()
790+
.try_collect::<()>()
791791
.await?;
792792

793793
Ok(())

eden/mononoke/git/import_tools/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ pub async fn import_commit_contents<Uploader: GitUploader, Reader: GitReader>(
543543
}
544544
})
545545
.try_buffer_unordered(100)
546-
.try_collect()
546+
.try_collect::<()>()
547547
.await?;
548548
// Upload packfile base item for Git commit and the raw Git commit
549549
let packfile_item_upload = async {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ pub async fn upload_commits<'a>(
829829
copy_file_contents(ctx, sm_repo.as_ref(), target_repo, content_ids, |_| {}).await
830830
})
831831
.buffer_unordered(10)
832-
.try_collect()
832+
.try_collect::<()>()
833833
.await?;
834834

835835
// Then copy from source repo

eden/mononoke/server/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ fn main(fb: FacebookInit) -> Result<()> {
348348
// Repo cache warmup can be quite expensive, let's limit to 40
349349
// at a time.
350350
.buffer_unordered(40)
351-
.try_collect()
351+
.try_collect::<()>()
352352
.await?;
353353
info!(&root_log, "Cache warmup completed");
354354
if let Some(mut executor) = args.sharded_executor_args.build_executor(

0 commit comments

Comments
 (0)