about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSparrowLii <liyuan179@huawei.com>2023-08-02 16:21:45 +0800
committerSparrowLii <liyuan179@huawei.com>2023-08-02 16:21:45 +0800
commit90db1132c76f0c7dae0bee33cbadbb1390a5881f (patch)
tree74fd1aa6a99683f08e94a9b06c344410672bd7fa
parentbeef07fe8fb98aca9f2b59c6a1b3e4f3ea4c0e15 (diff)
downloadrust-90db1132c76f0c7dae0bee33cbadbb1390a5881f.tar.gz
rust-90db1132c76f0c7dae0bee33cbadbb1390a5881f.zip
get auto traits for parallel rustc
Signed-off-by: SparrowLii <liyuan179@huawei.com>
-rw-r--r--compiler/rustc_ast/src/format.rs6
-rw-r--r--src/librustdoc/clean/utils.rs6
2 files changed, 0 insertions, 12 deletions
diff --git a/compiler/rustc_ast/src/format.rs b/compiler/rustc_ast/src/format.rs
index 699946f307b..805596ff00a 100644
--- a/compiler/rustc_ast/src/format.rs
+++ b/compiler/rustc_ast/src/format.rs
@@ -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 {
diff --git a/src/librustdoc/clean/utils.rs b/src/librustdoc/clean/utils.rs
index 5c8db3b8774..43d8bcae8e2 100644
--- a/src/librustdoc/clean/utils.rs
+++ b/src/librustdoc/clean/utils.rs
@@ -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