Skip to content

Re-enable --generate-link-to-defintion for tools internal rustdoc#137693

Merged
bors merged 1 commit intorust-lang:masterfrom
aDotInTheVoid:gaming
Mar 1, 2025
Merged

Re-enable --generate-link-to-defintion for tools internal rustdoc#137693
bors merged 1 commit intorust-lang:masterfrom
aDotInTheVoid:gaming

Conversation

@aDotInTheVoid
Copy link
Member

@aDotInTheVoid aDotInTheVoid commented Feb 26, 2025 •
edited
Loading

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

This was re enabled in #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

rust/src/librustdoc/html/render/span_map.rs

Lines 178 to 182 in ac91805

// FIXME: this is showing error messages for parts of the code that are not
// compiled (because of cfg)!
//
// See discussion in https://github.com/rust-lang/rust/issues/69426#issuecomment-1019412352
let typeck_results = tcx.typeck_body(tcx.hir_body_owned_by(body_id).id());

try-job: aarch64-apple

@rustbot
Copy link
Collaborator

rustbot commented Feb 26, 2025

r? @onur-ozkan

rustbot has assigned @onur-ozkan.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Feb 26, 2025
@aDotInTheVoid
Copy link
Member Author

aDotInTheVoid commented Feb 26, 2025

Last time this failed it was here: #122096 (comment). I think I've got the right incantation to test it, but the idk if the nightly-rustc build step has been moved to a difference CI job.

@bors try

@bors
Copy link
Collaborator

bors commented Feb 26, 2025

⌛ Trying commit e4d4db3 with merge 0396421...

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 26, 2025
@bors
Auto merge of rust-lang#137693 - aDotInTheVoid:gaming, r=<try>
0396421 
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
@GuillaumeGomez
Copy link
Member

GuillaumeGomez commented Feb 26, 2025

Interesting. I re-enabled it in #136589 (as you can see here). Do you know what this code would allow to do if not building rustc docs?

@aDotInTheVoid
Copy link
Member Author

aDotInTheVoid commented Feb 26, 2025

Ah. This enables it for tools (e.g. rustdoc). I'll update the commit message & description.

@aDotInTheVoid aDotInTheVoid changed the title Re-enable --generate-link-to-defintion for rustc rustdoc Re-enable --generate-link-to-defintion for tools internal rustdoc Feb 26, 2025
@GuillaumeGomez
Copy link
Member

GuillaumeGomez commented Feb 26, 2025

Oh indeed. I thought it was all generated in the same path, nice catch! r=me once CI pass

@onur-ozkan
Copy link
Contributor

onur-ozkan commented Feb 27, 2025

@bors r=onur-ozkan,GuillaumeGomez

@bors
Copy link
Collaborator

bors commented Feb 27, 2025

📌 Commit e28500d has been approved by onur-ozkan,GuillaumeGomez

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 27, 2025
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Feb 28, 2025
@jieyouxu
Rollup merge of rust-lang#137693 - aDotInTheVoid:gaming, r=onur-ozkan…
3f9ee0f 
…,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
@jieyouxu jieyouxu mentioned this pull request Feb 28, 2025
Closed
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Feb 28, 2025
@jieyouxu
Rollup merge of rust-lang#137693 - aDotInTheVoid:gaming, r=onur-ozkan…
429c796 
…,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
This was referenced Feb 28, 2025
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 1, 2025
@bors
Auto merge of rust-lang#137796 - jieyouxu:rollup-qt9yr1g, r=jieyouxu
30508fa 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#134943 (Add FileCheck annotations to mir-opt/issues)
 - rust-lang#137017 (Don't error when adding a staticlib with bitcode files compiled by newer LLVM)
 - rust-lang#137197 (Update some comparison codegen tests now that they pass in LLVM20)
 - rust-lang#137540 (Fix (more) test directives that were accidentally ignored)
 - rust-lang#137551 (import `simd_` intrinsics)
 - rust-lang#137599 (tests: use minicore more)
 - rust-lang#137673 (Fix Windows `Command` search path bug)
 - rust-lang#137676 (linker: Fix escaping style for response files on Windows)
 - rust-lang#137693 (Re-enable `--generate-link-to-defintion` for tools internal rustdoc)
 - rust-lang#137770 (Fix sized constraint for unsafe binder)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 9e1ead6 into rust-lang:master Mar 1, 2025
6 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Mar 1, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 1, 2025
@rust-timer
Unrolled build for rust-lang#137693
6e6b748 
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
@aDotInTheVoid aDotInTheVoid deleted the gaming branch March 1, 2025 12:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@GuillaumeGomez GuillaumeGomez GuillaumeGomez approved these changes

Assignees

@onur-ozkan onur-ozkan

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Projects

None yet

Milestone

1.87.0

Development

Successfully merging this pull request may close these issues.

5 participants

@aDotInTheVoid @rustbot @bors @GuillaumeGomez @onur-ozkan