Manual map 2021 false negative

Lint name: manual_map

The 2021 edition made closure capturing smarter. We can now make some suggestions that previously wouldn't compile.
Edition Docs

I tried this code:

This is the test case for issue #6797

    let x1 = (Some(String::new()), 0);
    let x2 = x1.0;

    match x2 {
        Some(x) => Some((x, x1.1)),
        None => None,
    };

I expected to see this happen:
This recommendation if I'm using 2021.

    x2.map(|x| Some((x, x1.1)));

Instead, this happened:
No, warning. It's a false negative.

playground

Start with the manual_map lint and reproduce the supplied Rust example in the linked Rust Playground using the 2021 edition. Compare its behavior with the expected map suggestion; done means the example receives the appropriate warning without regressing existing manual_map cases.