Skip to content

Conversation

GuillaumeGomez
Copy link
Member

Needed for #100883.

I cherry-picked commits from #100883, added documentation and added a warning (and its test) in case feature(doc_auto_cfg) is used without doc(auto_cfg).

Once this PR is merged, we'll wait for 1 release cycle to go back to #100883.

cc @Nemo157
r? @notriddle

@GuillaumeGomez GuillaumeGomez added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Oct 2, 2022
@rustbot rustbot added the A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic label Oct 2, 2022
@rustbot
Copy link
Collaborator

rustbot commented Oct 2, 2022

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

cc @camelid

rustc_error_messages was changed

cc @davidtwco, @compiler-errors, @JohnTitor, @estebank, @TaKO8Ki

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 2, 2022
@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez
Copy link
Member Author

Fixed the error.

@GuillaumeGomez
Copy link
Member Author

Updated and rebased. Thanks for the improvements!

@notriddle
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Oct 10, 2022

📌 Commit 20724ef has been approved by notriddle

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 Oct 10, 2022
@notriddle
Copy link
Contributor

Actually, no. I want to make sure #100883 (comment) is resolved first.

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 10, 2022
@bors
Copy link
Collaborator

bors commented Oct 12, 2022

☔ The latest upstream changes (presumably #102948) made this pull request unmergeable. Please resolve the merge conflicts.

@Noratrieb
Copy link
Member

Hi, I've seen you changed some diagnostic structs in your PR. After #103345, the way we refer to fluent messages changed. They are now in a flat namespace with the same identifier as in the fluent file. For example, parser::cool_thing is now parser_cool_thing and parser::suggestion just suggestion.
You should rebase to the latest master and change your fluent message references as described above. Thanks!

@GuillaumeGomez
Copy link
Member Author

Forgot to mention but we are writing an RFC for this and for doc(cfg) more generally.

@jyn514
Copy link
Member

jyn514 commented Apr 26, 2023

There are quite a lot of merge conflicts here. I'm going to close this for now until the RFC is accepted.

@jyn514 jyn514 closed this Apr 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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.

9 participants