Merge #11957 ...simple -- only apply the https://github.com/rust-analyzer/rust-analyzer... This PR fixes https://github.com/rust-analyzer/rust-analyzer... ...PR didn't fully fix / https://github.com/rust-analyzer/rust-analyzer... Not sure if it fixes / https://github.com/rust-analyzer/rust-analyzer...