Skip to content

Commit

Permalink
Rollup merge of #114321 - SparrowLii:parallel_test, r=oli-obk
Browse files Browse the repository at this point in the history
get auto traits for parallel rustc

test for #106930
#[Edit] Since this doesn't block try build now, we can close #106930

fixes #106930
  • Loading branch information
Noratrieb committed Aug 2, 2023
2 parents ddda3fa + 90db113 commit 0475873
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 12 deletions.
6 changes: 0 additions & 6 deletions compiler/rustc_ast/src/format.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,6 @@ pub struct FormatArguments {
names: FxHashMap<Symbol, usize>,
}

// FIXME: Rustdoc has trouble proving Send/Sync for this. See #106930.
#[cfg(parallel_compiler)]
unsafe impl Sync for FormatArguments {}
#[cfg(parallel_compiler)]
unsafe impl Send for FormatArguments {}

impl FormatArguments {
pub fn new() -> Self {
Self {
Expand Down
6 changes: 0 additions & 6 deletions src/librustdoc/clean/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -480,12 +480,6 @@ pub(crate) fn get_auto_trait_and_blanket_impls(
cx: &mut DocContext<'_>,
item_def_id: DefId,
) -> impl Iterator<Item = Item> {
// FIXME: To be removed once `parallel_compiler` bugs are fixed!
// More information in <https://github.com/rust-lang/rust/pull/106930>.
if cfg!(parallel_compiler) {
return vec![].into_iter().chain(vec![].into_iter());
}

let auto_impls = cx
.sess()
.prof
Expand Down

0 comments on commit 0475873

Please sign in to comment.