Don't wrap parens around expr in remove_dbg assist if its in conditions #6595
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
SomeoneToIgnore
approved these changes
Nov 20, 2020
| @@ -49,14 +49,28 @@ fn adjusted_macro_contents(macro_call: &ast::MacroCall) -> Option<String> { | |||
| macro_text_with_brackets.len() - TextSize::of(')'), | |||
| )); | |||
|
|
|||
| let is_leaf = macro_call.syntax().next_sibling().is_none(); | |||
| let is_leaf = is_leaf_or_control_flow_expr(macro_call); | |||
There was a problem hiding this comment.
Nit: the variable name now is a bit wrong.
IMO we can just inline it, it was extracted by me initially to document what macro_call().syntax().next_sibling().is_none() had meant, but now with a properly named function introduced it makes no sense anymore.
|
✌️ Veykril can now approve this pull request. To approve and merge a pull request, simply reply with |
Veykril
force-pushed
the
remove_dbg_cond
branch
from
677d626 to
5d39f6a
Compare
|
bors r+ |
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.
If the expr in the
dbg!macro consists of multiple elements it won't remove the parentheses if its in amatchor condition-using construct, as these are followed by siblings causing theis_leafcheck to fail.