Do not merge top-level modules with imports_granularity Module#6784
Conversation
rustbot
added
the
S-waiting-on-review
There was a problem hiding this comment.
Can you add the example from #6191 as a test case:
Specifically can you show that the following:
use {library1, library2 as lib2, library3};gets rewritten as follows since we're not merging top level imports:
use library1;
use library2 as lib2;
use library3;There was a problem hiding this comment.
That's what my addition to the test files does. But ok, I can make it match verbatim.
There was a problem hiding this comment.
Your test case shows that they're not getting merged, which I think is good, but what I want to demonstrate is that top level modules that are already merged will get unmerged.
There was a problem hiding this comment.
Not suggesting you remove what you've already got, just add the example from the original issue.
There was a problem hiding this comment.
Ah yeah makes sense, added it now.
| use a::{f, g::{h, i}}; | ||
| use a::{j::{self, k::{self, l}, m}, n::{o::p, q}}; | ||
| use a::{ | ||
| f, | ||
| g::{h, i}, | ||
| }; | ||
| use a::{ | ||
| j::{ | ||
| self, | ||
| k::{self, l}, | ||
| m, | ||
| }, | ||
| n::{o::p, q}, | ||
| }; |
There was a problem hiding this comment.
Wait, what's going on here? Why did all this change now?
There was a problem hiding this comment.
I don't think any of these changes are necessary. Let's revert all changes to tests/source/imports/imports_granularity_module.rs that aren't related to adding use {library1, library2 as lib2, library3};.
There was a problem hiding this comment.
Oh whoa, that was not intended. It must have been my vscode messing up the formatting. Will fix.
|
@rustbot author |
rustbot
added
S-waiting-on-author
|
Reminder, once the PR becomes ready for a review, use |
|
@rustbot ready |
rustbot
added
S-waiting-on-review
Signed-off-by: mwlon <m.w.loncaric@gmail.com>
Signed-off-by: mwlon <m.w.loncaric@gmail.com>
Signed-off-by: mwlon <m.w.loncaric@gmail.com>
This reverts commit 820451b.
Signed-off-by: mwlon <m.w.loncaric@gmail.com>
ytmimi
force-pushed
the
fix-imports-granularity-top-level-modules
branch
from
cf4b73d to
f89b67c
Compare
|
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
|
Thanks for fixing the tests |
rustbot
removed
the
S-waiting-on-review
3 participants
Fixes #6191 .