Fix x test compiler unit tests under rust.parallel-compiler = true

compiler/rustc_lint/Cargo.toml

@@ -27,3 +27,12 @@ rustc_type_ir = { path = "../rustc_type_ir" }
 tracing = "0.1"
 unicode-security = "0.1.0"
 # tidy-alphabetical-end
+
+[features]
+# tidy-alphabetical-start
+rustc_use_parallel_compiler = [
+    'rustc_data_structures/rustc_use_parallel_compiler',
+    'rustc_errors/rustc_use_parallel_compiler',
+    'rustc_middle/rustc_use_parallel_compiler',
+]
+# tidy-alphabetical-end

compiler/rustc_lint/src/if_let_rescope.rs

@@ -23,7 +23,9 @@ declare_lint! {
     ///
     /// ### Example
     ///
-    /// ```rust,edition2021
+    #[cfg_attr(bootstrap, doc = "```ignore")]
+    #[cfg_attr(not(bootstrap), doc = "```rust,edition2021")]
+    // ``` // Trick tidy's backtick count. Remove on bootstrap bump. #[cfg(not(bootstrap))]
     /// #![feature(if_let_rescope)]
     /// #![warn(if_let_rescope)]
     /// #![allow(unused_variables)]

compiler/rustc_lint_defs/Cargo.toml

@@ -15,3 +15,11 @@ rustc_span = { path = "../rustc_span" }
 rustc_target = { path = "../rustc_target" }
 serde = { version = "1.0.125", features = ["derive"] }
 # tidy-alphabetical-end
+
+[features]
+# tidy-alphabetical-start
+rustc_use_parallel_compiler = [
+    'rustc_data_structures/rustc_use_parallel_compiler',
+    'rustc_error_messages/rustc_use_parallel_compiler',
+]
+# tidy-alphabetical-end

compiler/rustc_lint_defs/src/builtin.rs

@@ -1870,7 +1870,9 @@ declare_lint! {
     ///
     /// ### Example
     ///
-    /// ```rust,compile_fail
+    #[cfg_attr(bootstrap, doc = "```ignore")]
+    #[cfg_attr(not(bootstrap), doc = "```rust,compile_fail")]
+    // ``` // Trick tidy's backtick count. Remove on bootstrap bump. #[cfg(not(bootstrap))]
     /// #![deny(elided_named_lifetimes)]
     /// struct Foo;
     /// impl Foo {

compiler/rustc_middle/Cargo.toml

@@ -41,5 +41,11 @@ tracing = "0.1"
 [features]
 # tidy-alphabetical-start
 rustc_randomized_layouts = []
-rustc_use_parallel_compiler = ["dep:rustc-rayon-core"]
+rustc_use_parallel_compiler = [
+    "dep:rustc-rayon-core",
+    "rustc_data_structures/rustc_use_parallel_compiler",
+    "rustc_errors/rustc_use_parallel_compiler",
+    "rustc_error_messages/rustc_use_parallel_compiler",
+    "rustc_query_system/rustc_use_parallel_compiler",
+]
 # tidy-alphabetical-end

compiler/rustc_mir_transform/Cargo.toml

@@ -29,3 +29,12 @@ rustc_type_ir = { path = "../rustc_type_ir" }
 smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
 tracing = "0.1"
 # tidy-alphabetical-end
+
+[features]
+# tidy-alphabetical-start
+rustc_use_parallel_compiler = [
+    'rustc_data_structures/rustc_use_parallel_compiler',
+    'rustc_errors/rustc_use_parallel_compiler',
+    'rustc_middle/rustc_use_parallel_compiler',
+]
+# tidy-alphabetical-end

src/tools/lint-docs/src/lib.rs

@@ -206,6 +206,15 @@ impl<'a> LintExtractor<'a> {
                     None => return Ok(lints),
                 }
             };
+
+            fn strip_prefix_and_suffix<'a>(
+                line: &'a str,
+                prefix: &str,
+                suffix: &str,
+            ) -> Option<&'a str> {
+                line.strip_prefix(prefix)?.strip_suffix(suffix)
+            }
+
             // Read the lint.
             let mut doc_lines = Vec::new();
             let (doc, name) = loop {
@@ -216,6 +225,20 @@ impl<'a> LintExtractor<'a> {
                             doc_lines.push(text.to_string());
                         } else if line == "///" {
                             doc_lines.push("".to_string());
+                        } else if let Some(_) = strip_prefix_and_suffix(
+                            line,
+                            r##"#[cfg_attr(bootstrap, doc = ""##,
+                            r##"")]"##,
+                        ) {
+                            // Ignore bootstrap-only parts of the doc comment.
+                            continue;
+                        } else if let Some(text) = strip_prefix_and_suffix(
+                            line,
+                            r##"#[cfg_attr(not(bootstrap), doc = ""##,
+                            r##"")]"##,
+                        ) {
+                            // Include not-bootstrap parts of the doc comment.
+                            doc_lines.push(text.to_string())
                         } else if line.starts_with("// ") {
                             // Ignore comments.
                             continue;