Merge ref '8afb6a8b1b32' from rust-lang/rust

Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: rust-lang/rust@8afb6a8b1b32fce2f8aa7520517833338dc36c5e
Filtered ref: rust-lang/rust-analyzer@82d0ddb677387a261d5ab96c5a6503fc5e0ae730
Upstream diff: https://github.com/rust-lang/rust/compare/1d72d7e8136faaebad3a85eeed432e6ea1b2ffab...8afb6a8b1b32fce2f8aa7520517833338dc36c5e

This merge was created using https://github.com/rust-lang/josh-sync.