commit 6d61be8e65ac0fd45eaf178e1f7a1ec6b582de1f
author bors <bors@rust-lang.org> Sun Nov 27 12:18:42 2022 +0000
committer bors <bors@rust-lang.org> Sun Nov 27 12:18:42 2022 +0000
tree bfb92430118ee60900e620f3f0742298e34e2d2a
parent 34e2bc6a541cca670307cec94cfc5546016705d6
parent 8e03f18e37d2782189391955bc56d3aebead81f5

Auto merge of #13681 - lowr:fix/extract-function-tail-expr, r=Veykril

fix: check tail expressions more precisely in `extract_function`

Fixes #13620

When extracting expressions with control flows into a function, we can avoid wrapping tail expressions in `Option` or `Result` when they are also tail expressions of the container we're extracting from (see #7840, #9773). This is controlled by `ContainerInfo::is_in_tail`, but we've been computing it by checking if the tail expression of the range to extract is contained in the container's syntactically last expression, which may be a block that contains both tail and non-tail expressions (e.g. in #13620, the range to be extracted is not a tail expression but we set the flag to true).

This PR tries to compute the flag as precise as possible by utilizing `for_each_tail_expr()` (and also moves the flag to `Function` struct as it's more of a property of the function to be extracted than of the container).