Skip to content

Commit 0475873

Browse files
authored
Rollup merge of rust-lang#114321 - SparrowLii:parallel_test, r=oli-obk
get auto traits for parallel rustc test for rust-lang#106930 #[Edit] Since this doesn't block try build now, we can close rust-lang#106930 fixes rust-lang#106930
2 parents ddda3fa + 90db113 commit 0475873

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

compiler/rustc_ast/src/format.rs

-6
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,6 @@ pub struct FormatArguments {
6767
names: FxHashMap<Symbol, usize>,
6868
}
6969

70-
// FIXME: Rustdoc has trouble proving Send/Sync for this. See #106930.
71-
#[cfg(parallel_compiler)]
72-
unsafe impl Sync for FormatArguments {}
73-
#[cfg(parallel_compiler)]
74-
unsafe impl Send for FormatArguments {}
75-
7670
impl FormatArguments {
7771
pub fn new() -> Self {
7872
Self {

src/librustdoc/clean/utils.rs

-6
Original file line numberDiff line numberDiff line change
@@ -480,12 +480,6 @@ pub(crate) fn get_auto_trait_and_blanket_impls(
480480
cx: &mut DocContext<'_>,
481481
item_def_id: DefId,
482482
) -> impl Iterator<Item = Item> {
483-
// FIXME: To be removed once `parallel_compiler` bugs are fixed!
484-
// More information in <https://github.com/rust-lang/rust/pull/106930>.
485-
if cfg!(parallel_compiler) {
486-
return vec![].into_iter().chain(vec![].into_iter());
487-
}
488-
489483
let auto_impls = cx
490484
.sess()
491485
.prof

0 commit comments

Comments
 (0)