Get the block content from the proper context #15014
Conversation
rustbot
added
the
S-waiting-on-review
| && 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.
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.
samueltardieu
force-pushed
the
issue-15005
branch
from
22d9980 to
bd33a02
Compare
|
Rebased |
|
Lintcheck changes for bd33a02
This comment will be updated if you push new changes |
| && 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()) |
rustbot
removed
the
S-waiting-on-review
3 participants
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