fix: correct generic bound indentation [2.x/master] #4640
Merged
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
calebcartwright
commented
Jan 12, 2021
| @@ -933,7 +933,7 @@ fn join_bounds_inner( | |||
| _ => false, | |||
| }; | |||
|
|
|||
| let shape = if i > 0 && need_indent && force_newline { | |||
| let shape = if need_indent && force_newline { | |||
There was a problem hiding this comment.
The way the code is structured, force_newline will always be false on the first pass through and a second pass is only triggered in situations where we have to use multiple lines to format. As such this index check only serves to cause a bug
calebcartwright
commented
Jan 12, 2021
Comment on lines
+967
to
+969
| let (extendable, trailing_str) = if i == 0 { | ||
| let bound_str = item.rewrite(context, shape)?; | ||
| let bound_str_clone = bound_str.clone(); | ||
| (bound_str, is_bound_extendable(&bound_str_clone, item)) | ||
| (is_bound_extendable(&bound_str, item), bound_str) |
There was a problem hiding this comment.
Neither related to the underlying bug nor necessary to fix it, just noticed while in here that we were unnecessarily cloning the formatted bound
|
backport in #4653 |
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.
Fixes #4636