update rewrite_assignment to return RewriteResult #6295
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
ding-young
force-pushed
the
rw-assign-rhs
branch
from
e6ebbbe to
03fcf0d
Compare
ding-young
commented
Aug 28, 2024
src/expr.rs
Outdated
Comment on lines
2208
to
2229
| match (orig_rhs, new_rhs) { | ||
| (Some(ref orig_rhs), Some(ref new_rhs)) | ||
| (Ok(ref orig_rhs), Ok(ref new_rhs)) | ||
| if !filtered_str_fits(&new_rhs, context.config.max_width(), new_shape) => | ||
| { | ||
| Some(format!("{before_space_str}{orig_rhs}")) | ||
| Ok(format!("{before_space_str}{orig_rhs}")) | ||
| } | ||
| (Some(ref orig_rhs), Some(ref new_rhs)) | ||
| (Ok(ref orig_rhs), Ok(ref new_rhs)) | ||
| if prefer_next_line(orig_rhs, new_rhs, rhs_tactics) => | ||
| { | ||
| Some(format!("{new_indent_str}{new_rhs}")) | ||
| Ok(format!("{new_indent_str}{new_rhs}")) | ||
| } | ||
| (None, Some(ref new_rhs)) => Some(format!("{new_indent_str}{new_rhs}")), | ||
| (None, None) if rhs_tactics == RhsTactics::AllowOverflow => { | ||
| (Err(_), Ok(ref new_rhs)) => Ok(format!("{new_indent_str}{new_rhs}")), | ||
| (Err(_), Err(_)) if rhs_tactics == RhsTactics::AllowOverflow => { | ||
| let shape = shape.infinite_width(); | ||
| expr.rewrite(context, shape) | ||
| expr.rewrite_result(context, shape) | ||
| .map(|s| format!("{}{}", before_space_str, s)) | ||
| } | ||
| (None, None) => None, | ||
| (Some(orig_rhs), _) => Some(format!("{before_space_str}{orig_rhs}")), | ||
| (Err(_), Err(new_rhs_err)) => Err(new_rhs_err), | ||
| (Ok(orig_rhs), _) => Ok(format!("{before_space_str}{orig_rhs}")), |
There was a problem hiding this comment.
(Err(_), Err(new_rhs_err)) => Err(new_rhs_err),
refer to the comment in #6291
There was a problem hiding this comment.
I've got a similar response: #6291 (comment). I think it's fine to use the 2nd error as the return, and I think adding a comment to explain that we could have chosen either would be nice.
ytmimi
added
GSoC
ding-young
force-pushed
the
rw-assign-rhs
branch
from
03fcf0d to
c4a0e76
Compare
ytmimi
approved these changes
Sep 1, 2024
|
Thanks for leaving the note! I've started the Diff Check |
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.
tracked by #6206
Description
update
rewrite_assignmentto returnRewriteResult