Skip to content

Conversation

fmease
Copy link
Member

@fmease fmease commented Jan 9, 2024

Fixes #119529.

This PR contains several refactorings apart from the bug fix.
Best reviewed commit by commit.
r? GuillaumeGomez

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jan 9, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jan 9, 2024

Some changes occurred in src/librustdoc/clean/types.rs

cc @camelid

@fmease
Copy link
Member Author

fmease commented Jan 9, 2024

CI failure due to GitHub-internal issues. See https://www.githubstatus.com/.

@fmease fmease force-pushed the rustdoc-off-by-one-dyn-trait-def-gen-args branch from f54f885 to f6511b9 Compare January 9, 2024 14:48
@GuillaumeGomez
Copy link
Member

Nothing to say except: great work! r=me once CI pass.

@rust-log-analyzer

This comment has been minimized.

fmease added 6 commits January 9, 2024 17:03
The new names are consistent with the other rustc_middle cleaning functions.
Regarding the local variable `ty_args`, it's used throughout the function and
personally speaking its name isn't very legible, I trip up on it.
@fmease fmease force-pushed the rustdoc-off-by-one-dyn-trait-def-gen-args branch from f6511b9 to 2d010bc Compare January 9, 2024 16:42
@fmease
Copy link
Member Author

fmease commented Jan 9, 2024

@bors r=GuillaumeGomez rollup

@bors
Copy link
Collaborator

bors commented Jan 9, 2024

📌 Commit 2d010bc has been approved by 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 Jan 9, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 10, 2024
…iaskrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#106893 (Explain base expression for struct update syntax)
 - rust-lang#119769 (rustdoc: offset generic args of cross-crate trait object types when cleaning)
 - rust-lang#119772 (Fix an ICE that occurs after an error has already been reported)
 - rust-lang#119782 (rint intrinsics: caution against actually trying to check for floating-point exceptions)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 7c378d0 into rust-lang:master Jan 10, 2024
@rustbot rustbot added this to the 1.77.0 milestone Jan 10, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 10, 2024
Rollup merge of rust-lang#119769 - fmease:rustdoc-off-by-one-dyn-trait-def-gen-args, r=GuillaumeGomez

rustdoc: offset generic args of cross-crate trait object types when cleaning

Fixes rust-lang#119529.

This PR contains several refactorings apart from the bug fix.
Best reviewed commit by commit.
r? GuillaumeGomez
@fmease fmease deleted the rustdoc-off-by-one-dyn-trait-def-gen-args branch January 10, 2024 10:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rustdoc ICE - 'expected a const, but found another kind'
5 participants