Get the block content from the proper context #15014
Open
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
The first statement of the block might have been in a different context from the expression. Walk up to the right context to get bounds properly. Also, switch to `snippet_with_applicability()` since we know that we are in the right context already.
rustbot
added
the
S-waiting-on-review
y21
reviewed
Jun 20, 2025
Comment on lines
-73
to
-79
| && let ctxt = expr.span.ctxt() | ||
| && then_expr.span.ctxt() == ctxt | ||
| && !expr.span.from_expansion() | ||
| && !then_expr.span.from_expansion() | ||
| && is_res_lang_ctor(cx, path_res(cx, then_call), OptionSome) | ||
| && is_res_lang_ctor(cx, path_res(cx, peel_blocks(els)), OptionNone) | ||
| && !is_else_clause(cx.tcx, expr) | ||
| && !is_in_const_context(cx) | ||
| && !expr.span.in_external_macro(cx.sess().source_map()) |
There was a problem hiding this comment.
Is there a reason for why we don't want to lint code from within local macros anymore?
There was a problem hiding this comment.
Good question. Is there a context in which I can get the non-expanded code? If the if … { Some(…) } else { None } is in the macro, using the context of the if expression is not enough to get non-expanded code for the condition or the content of the Some. How can I retrieve it?
There was a problem hiding this comment.
Another reason would be that we sometimes suggest .then(|| …) and sometimes .then_some(). Here, in a macro, we would have to suggest .then(|| …) because we won't check every call for the absence of side effects.
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
The first statement of the block might have been in a different context from the expression. Walk up to the right context to get bounds properly.
Also, switch to
snippet_with_applicability()since we know that we are in the right context already.changelog: [
if_then_some_else_none]: emit well-formed suggestion, and do not lint inside macrosFixes #15005