Merge imports #2603
Merge imports #2603
Conversation
src/imports.rs
Outdated
|
|
||
| impl fmt::Debug for UseTree { | ||
| fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { | ||
| write!(f, "{}", self) |
There was a problem hiding this comment.
Nit: think writing <Self as Display>::fmt(self, f) is clearer (and more efficient) than using write!
There was a problem hiding this comment.
It can be Display::fmt(self, f) too which is less verbose.
src/imports.rs
Outdated
| impl UseTree { | ||
| // Rewrite use tree with `use ` and a trailing `;`. | ||
| pub fn rewrite_top_level(&self, context: &RewriteContext, shape: Shape) -> Option<String> { | ||
| let mut result = String::with_capacity(256); | ||
| if let Some(ref attrs) = self.attrs { | ||
| result.push_str(&attrs.rewrite(context, shape)?); | ||
| result.push_str(&attrs.rewrite(context, shape).expect("rewrite attr")); |
There was a problem hiding this comment.
Why change this? It seems that we could crash if the attribute can't be rewritten.
There was a problem hiding this comment.
Ah, I changed this for debugging purpose, but I forgot to bring this back.
| @@ -168,6 +241,17 @@ impl UseTree { | |||
| Some(result) | |||
| } | |||
|
|
|||
| // FIXME: Use correct span? | |||
There was a problem hiding this comment.
The span could be wrong when we are using the span from list imports. It should not matter, though, since we have already extracted comments around use items at this point.
There was a problem hiding this comment.
Could you add this detail to the comment please?
src/imports.rs
Outdated
| break; | ||
| } | ||
| } | ||
| if let Some(merged) = merge_rest(&self.path, &other.path, len) { |
There was a problem hiding this comment.
len is always at new_path.len(), right?
topecongiro
force-pushed
the
merge-nested-imports
branch
from
5155f1e
to
8820a59
Compare
|
Ping @nrc 😄 |
|
Thanks for the changes! |
|
Is it intended for this to put all std:: imports in a single block? e.g. |
This PR adds a
merge_importsconfig option, which merges multiple imports with the same prefix into a single nested import.Thoughts:
usize(0 means no merging, 1 means merging the top level segment, and so on), but it turned out to be kind of counter-intuitive IMO, so came back to true/false.Closes #1383. Closes #2452. Closes #2544.