Skip to content

Commit 3f9ee0f

Browse files
authored
Rollup merge of rust-lang#137693 - aDotInTheVoid:gaming, r=onur-ozkan,GuillaumeGomez
Re-enable `--generate-link-to-defintion` for tools internal rustdoc ~~These were removed because they used to break the build: rust-lang#122066 (comment), but testing locally it seems to work now.~~ This was re enabled in rust-lang#136589, but only for rustc, not tools. 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
2 parents c14e217 + e28500d commit 3f9ee0f

File tree

1 file changed

+1
-3
lines changed
  • src/bootstrap/src/core/build_steps

1 file changed

+1
-3
lines changed

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -987,9 +987,7 @@ macro_rules! tool_doc {
987987
cargo.rustdocflag("-Arustdoc::private-intra-doc-links");
988988
cargo.rustdocflag("--enable-index-page");
989989
cargo.rustdocflag("--show-type-layout");
990-
// FIXME: `--generate-link-to-definition` tries to resolve cfged out code
991-
// see https://github.com/rust-lang/rust/pull/122066#issuecomment-1983049222
992-
// cargo.rustdocflag("--generate-link-to-definition");
990+
cargo.rustdocflag("--generate-link-to-definition");
993991

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

0 commit comments

Comments
 (0)