Nested closures give suboptimal move suggestion

[oli-obk]

The following code needs a move on the map closure, but the suggestion first tells us to add it to the flat_map closure. After following that suggestion, the next error will tell us to put it on the map closure. This terminates correctly, but should suggest the final thing immediately. Note that with many nested levels of closures, there will be one error-fix-recompile cycle per nested closure until we get it working.

pub struct X;

pub fn foo<'a>(
    bar: &'a X,
) -> impl Iterator<Item = ()> + 'a {
    Some(()).iter().flat_map(|()| {
        Some(()).iter().map(|()| { bar; })
    })
}

(Playground)

Errors:

   Compiling playground v0.0.1 (/playground)
error: captured variable cannot escape `FnMut` closure body
 --> src/lib.rs:7:9
  |
6 |     Some(()).iter().flat_map(move |()| {
  |                                      - inferred to be a `FnMut` closure
7 |         Some(()).iter().map(|()| { bar; })
  |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ returns a reference to a captured variable which escapes the closure body
  |
  = note: `FnMut` closures only have access to their captured variables while they are executing...
  = note: ...therefore, they cannot allow references to captured variables to escape

error: aborting due to previous error

error: Could not compile `playground`.

To learn more, run the command again with --verbose.

[estebank]

Note that both moves are needed.

[oli-obk]

Oh... hmm... I thought I had a situation where only the inner one is needed. I'll investigate more.

[estebank]

Triage: little change.

Current output:

error[E0373]: closure may outlive the current function, but it borrows `bar`, which is owned by the current function
 --> src/lib.rs:6:30
  |
6 |     Some(()).iter().flat_map(|()| {
  |                              ^^^^ may outlive borrowed value `bar`
7 |         Some(()).iter().map(|()| { bar; })
  |                                    --- `bar` is borrowed here
  |
note: closure is returned here
 --> src/lib.rs:6:5
  |
6 | /     Some(()).iter().flat_map(|()| {
7 | |         Some(()).iter().map(|()| { bar; })
8 | |     })
  | |______^
help: to force the closure to take ownership of `bar` (and any other referenced variables), use the `move` keyword
  |
6 |     Some(()).iter().flat_map(move |()| {
  |                              ++++

and when applying the suggestion we fail to suggest the second necessary move:

error: captured variable cannot escape `FnMut` closure body
 --> src/lib.rs:7:9
  |
4 |     bar: &'a X,
  |     --- variable defined here
5 | ) -> impl Iterator<Item = ()> + 'a {
6 |     Some(()).iter().flat_map(move |()| {
  |                                      - inferred to be a `FnMut` closure
7 |         Some(()).iter().map(|()| { bar; })
  |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^---^^^^
  |         |                          |
  |         |                          variable captured here
  |         returns a reference to a captured variable which escapes the closure body
  |
  = note: `FnMut` closures only have access to their captured variables while they are executing...
  = note: ...therefore, they cannot allow references to captured variables to escape