fix: imports_granularity module with path containing self #5253
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
|
Moves towards stabilising |
|
Thanks so much! Will try to get to this shortly |
src/imports.rs
Outdated
| if merge_by == SharedPrefix::Module { | ||
| flattened = flattened.nest_trailing_self(); | ||
| } | ||
| result.push(flattened.nest_trailing_self()); |
There was a problem hiding this comment.
Is it necessary to make this nest call in the non-module case, and twice for the module case?
If so could you add or point to a test case that demonstrates why?
There was a problem hiding this comment.
Nope, that's definitely unnecessary, good spot. I added the conditional merge_by check later, I just forgot to remove the unconditional case.
Squashed and updated, ready for review again.
tommilligan
force-pushed
the
4681-imports-granularity-module-self
branch
from
79fe168 to
a82b008
Compare
|
Excellent, thank you! |
16 tasks
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.
Closes #4681
(unintentionally) ports #4716 from
rustfmt-2.0.0-rc.2tomaster, with some additional refactoring.It looks like this issue was already fixed, but was then lost in the
rustfmt-2.0.0-rc.2branch on this commit: 0e90855I implemented this separately but came up with a satisfyingly similar implementation - I've read the review comments on the original PR, so I don't think there should be much to add, but do let me know if anything needs changing!