rustdoc: Prevent duplicated imports #108349
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
A-rustdoc-json
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 23, 2023
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#108063 (Ban associated type bounds in bad positions) - rust-lang#108208 (Correctly handle aggregates in DataflowConstProp) - rust-lang#108218 (Windows: Quote more batch file arguments) - rust-lang#108349 (rustdoc: Prevent duplicated imports) - rust-lang#108350 (Use associated type bounds in some places in the compiler) - rust-lang#108358 (Add git config command to `.git-blame-ignore-revs`) - rust-lang#108373 (hir-analysis: make where-clause-on-main diagnostic translatable) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #108163.
Interestingly enough, the AST is providing us an import for each corresponding item, even though the
Reslinks to multiple ones each time, which leaded to the same import being duplicated.So in this PR, I decided to prevent the add of the import before the clean pass. However, I originally took a different path by instead filtering after cleaning the path. You can see it here. Only the second commit differs.
I think this approach is better though, but at least we can compare both if we want.
The first commit adds the check for duplicated items in the rustdoc-json output as asked in #108163.
cc @aDotInTheVoid
r? @notriddle