Skip to content

Commit

Permalink
Auto merge of rust-lang#137693 - aDotInTheVoid:gaming, r=<try>
Browse files Browse the repository at this point in the history
Re-enable `--generate-link-to-defintion` for rustc rustdoc

These were removed because they used to break the build: rust-lang#122066 (comment), but testing locally it seems to work now.

The FIXME that prompted removing this is still present. Do we have an issue with an MCVE for this? CC `@GuillaumeGomez`

https://github.com/rust-lang/rust/blob/ac91805f3179fc2225c60e8ccf5a1daa09d43f3d/src/librustdoc/html/render/span_map.rs#L178-L182

try-job: aarch64-apple
  • Loading branch information
bors committed Feb 26, 2025
2 parents ac91805 + e4d4db3 commit 0396421
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions src/bootstrap/src/core/build_steps/doc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -987,9 +987,7 @@ macro_rules! tool_doc {
cargo.rustdocflag("-Arustdoc::private-intra-doc-links");
cargo.rustdocflag("--enable-index-page");
cargo.rustdocflag("--show-type-layout");
// FIXME: `--generate-link-to-definition` tries to resolve cfged out code
// see https://github.com/rust-lang/rust/pull/122066#issuecomment-1983049222
// cargo.rustdocflag("--generate-link-to-definition");
cargo.rustdocflag("--generate-link-to-definition");

let out_dir = builder.stage_out(compiler, Mode::ToolRustc).join(target).join("doc");
$(for krate in $crates {
Expand Down

0 comments on commit 0396421

Please sign in to comment.