Skip to content

Commit 3157d50

Browse files
authored
Rollup merge of rust-lang#151092 - generate-macro-expansion-compiler-crates-docs, r=jieyouxu
Generate macro expansion for rust compiler crates docs Re-enable rust-lang#150022, which was disabled in rust-lang#149831 because some fixes hadn't been merged then. r? @jieyouxu
2 parents f6a07ef + 7544563 commit 3157d50

1 file changed

Lines changed: 7 additions & 0 deletions

File tree

  • src/bootstrap/src/core/build_steps

src/bootstrap/src/core/build_steps/doc.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -932,6 +932,13 @@ impl Step for Rustc {
932932
// see https://github.com/rust-lang/rust/pull/122066#issuecomment-1983049222
933933
// If there is any bug, please comment out the next line.
934934
cargo.rustdocflag("--generate-link-to-definition");
935+
// FIXME: Currently, `--generate-macro-expansion` option is buggy in `beta` rustdoc. To
936+
// allow CI to pass, we only enable the option in stage 2 and higher.
937+
// cfg(bootstrap)
938+
// ^ Adding this so it's not forgotten when the new release is done.
939+
if builder.top_stage > 1 {
940+
cargo.rustdocflag("--generate-macro-expansion");
941+
}
935942

936943
compile::rustc_cargo(builder, &mut cargo, target, &build_compiler, &self.crates);
937944
cargo.arg("-Zskip-rustdoc-fingerprint");

0 commit comments

Comments
 (0)