]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #71494 - flip1995:while_let_span, r=petrochenkov
authorDylan DPC <dylan.dpc@gmail.com>
Sat, 25 Apr 2020 09:25:50 +0000 (11:25 +0200)
committerGitHub <noreply@github.com>
Sat, 25 Apr 2020 09:25:50 +0000 (11:25 +0200)
Fix span of while (let) expressions after lowering

Credit goes to @alex-700 who found this while trying to fix a suggestion in Clippy.

While `if`, `try`, `for` and `await` expressions get the span of the original expression when desugared, `while` loops got the span of the scrutinee, which lead to weird code, when building the suggestion, that randomly worked: https://github.com/rust-lang/rust-clippy/pull/5511/files#diff-df4e9d2bf840a5f2e3b580bef73da3bcR106-R108

I'm wondering, if `DesugaringKind` should get a variant `WhileLoop` and instead of using the span of the `ast::ExprKind::While` expr directly, a new span with `self.mark_span_with_reason` should be used, like it is done with `for` loops.

There was some fallout, but I think that is acceptable. If not, I need some help to find out where this can be fixed.


Trivial merge