fix: Better import placement + merging#21635
Merged
ShoyuVanilla merged 3 commits intorust-lang:masterfrom Feb 20, 2026
Merged
Conversation
Contributor
Author
|
@Billy-Sheppard am i missing anything in this one? |
2f9491d to
20a4b8d
Compare
|
Does it solve this issue here? // `x`
use foo::Foo;
#[cfg(target_arch = "x86_64")] // `y`
use bar::Baz;When I auto-import within a #[cfg(target_arch = "x86_64")]
fn buzz() {
use buzz::Buzz;
}To make something like // `x`
use foo::Foo;
#[cfg(target_arch = "x86_64")] // `y`
use {
bar::Baz,
buzz::Buzz,
}; |
tascord
commented
Feb 14, 2026
Member
ShoyuVanilla
left a comment
There was a problem hiding this comment.
Looks great overall 👍
2.
#[cfg]attribute ordering matters (was a FIXME)#[cfg(a)] #[cfg(b)] use foo; #[cfg(b)] #[cfg(a)] use bar; // RA wouldn't merge these before
Could you add a test for this case as well?
ca83fa7 to
70f6c24
Compare
70f6c24 to
75a8d56
Compare
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 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.
fix stuff relating to imports.
#[cfg]'s act as hard barriers for import globbing#[cfg]attribute ordering matters (was a FIXME)If an existing
#[cfg]useblock exists, RA will still prefer to create a new import block instead of merging, when in#[cfg]'d functions. (Import insertion on signature for cfg attributed function puts import into the function #9391)