Merge #8489 This improves on https://github.com/rust-analyzer/rust-analyzer... ![on enter](https://user-images.githubusercontent.com/1786438/114444123...
Merge #8443 #8446 Part of https://github.com/rust-analyzer/rust-analyzer... Reverts the change made in https://github.com/rust-analyzer/rust-analyzer...