fix: preserve comments after imports - #7126
Closed
efegokdemir wants to merge 1 commit into
Closed
efegokdemir wants to merge 1 commit into
efegokdemir wants to merge 1 commit into
Conversation
Signed-off-by: Efe Gökdemir <efe@rexcode.co.uk>
rustbot
added
the
S-waiting-on-review
ytmimi
reviewed
Sep 20, 2026
rustbot
added
S-waiting-on-author
Collaborator
|
Reminder, once the PR becomes ready for a review, use |
Collaborator
|
☔ The latest upstream changes (possibly #7127) made this pull request unmergeable. Please resolve the merge conflicts. |
rustbot
removed
the
S-waiting-on-author
Member
|
Moderation note: #7129 (comment) |
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
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.
Summary
Preserve comments placed between a top-level
usepath and its terminating semicolon. Rustfmt was reconstructing the import from the AST path and dropping these comments.Changes
Testing
cargo fmt -- --check✅git diff --check✅cargo test --lockedrustc-devand internal compiler crates (rustc_ast,rustc_driver, and related components).Notes
The recovery is limited to comments not already present in the reconstructed import, so nested import comment handling remains unchanged. The issue's maintainer indicated that LLM assistance is permitted for this contribution; the implementation and PR description have been reviewed manually.