support closure block indent_style #3867
Merged
Conversation
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
|
CI failures are due to issues with latest nightly, see #3864 |
calebcartwright
force-pushed
the
closure-block-style
branch
from
78ba6e7 to
e41f32a
Compare
calebcartwright
commented
Oct 25, 2019
src/closures.rs
Outdated
| let param_shape = nested_shape.offset_left(1)?.visual_indent(0); | ||
| let param_shape = match indent_style { | ||
| IndentStyle::Block => { | ||
| if version == Version::Two { |
There was a problem hiding this comment.
I should drop the version gating from here since this would be a v2.x change (not going into v1.x) correct?
There was a problem hiding this comment.
Yes, I will remove the version anyway so it would be helpful if you can remove it in this PR :)
topecongiro
approved these changes
Oct 26, 2019
src/closures.rs
Outdated
| IndentStyle::Block => list_str.contains('\n') || list_str.len() > one_line_budget, | ||
| _ => false, | ||
| }; | ||
| let (param_str, put_params_in_block) = if multi_line_params && !item_vec.is_empty() { |
There was a problem hiding this comment.
Nit: would you mind simplifying this if block into something like the following
let put_params_in_block = multi_line_params && !item_vec.is_empty();
let param_str = if !put_params_in_block {
list_str
} else {
// ...
};There was a problem hiding this comment.
Nit: would you mind simplifying this
ifblock into something like the following
Good spot, that's a small change but definitely helps improve readability 👍 I will update it accordingly
calebcartwright
force-pushed
the
closure-block-style
branch
from
2fa6f79 to
22fe6a5
Compare
ytmimi
pushed a commit
to ytmimi/rustfmt
that referenced
this pull request
Mar 31, 2022
ytmimi
added
1x-backport:pending
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 #3865