fix: unnecessary_cast suggests extra brackets when in macro
#14643
+91
−16
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
rustbot
added
the
S-waiting-on-review
Jarcho
requested changes
Apr 17, 2025
rustbot
added
S-waiting-on-author
profetia
force-pushed
the
issue14640
branch
2 times, most recently
from
cd7fc83 to
471f9c5
Compare
Jarcho
requested changes
Apr 22, 2025
Jarcho
reviewed
Apr 22, 2025
Jarcho
reviewed
Apr 22, 2025
Jarcho
reviewed
Apr 23, 2025
Jarcho
requested changes
Apr 25, 2025
Comment on lines
+162
to
+172
| fn is_in_allowed_macro(cx: &LateContext<'_>, expr: &Expr<'_>) -> bool { | ||
| const ALLOWED_MACROS: &[Symbol] = &[ | ||
| sym::format_args_macro, | ||
| sym::assert_eq_macro, | ||
| sym::debug_assert_eq_macro, | ||
| sym::assert_ne_macro, | ||
| sym::debug_assert_ne_macro, | ||
| ]; | ||
| matches!(expr.span.ctxt().outer_expn_data().macro_def_id, Some(def_id) if | ||
| ALLOWED_MACROS.iter().any(|&sym| cx.tcx.is_diagnostic_item(sym, def_id))) | ||
| } |
There was a problem hiding this comment.
You want to use get_diagnostic_name when checking for multiple possible diagnostic items.
| // Changing `&(x as i32)` to `&x` would change the meaning of the code because the previous creates | ||
| // a reference to the temporary while the latter creates a reference to the original value. | ||
| let surrounding = match cx.tcx.parent_hir_node(expr.hir_id) { | ||
| Node::Expr(parent) if !is_in_allowed_macro(cx, parent) && is_borrow_expr(cx, parent) => { |
There was a problem hiding this comment.
Small perf nit: The macro check only needs to occur for AddrOf expressions and like it currently does the adjustment check only needs to occur for other expressions.
Comment on lines
+155
to
+159
| || cx | ||
| .typeck_results() | ||
| .expr_adjustments(expr) | ||
| .iter() | ||
| .any(|adj| matches!(adj.kind, Adjust::Borrow(_))) |
There was a problem hiding this comment.
Another small nit: Only the first adjustment needs to be checked. Any later borrow would have to borrow a temporary.
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 #14640
changelog: [
unnecessary_cast] fix extra brackets in suggestions when in macro