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

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

Upstream ref: rust-lang/rust@8afb6a8
Filtered ref: rust-lang/rust-analyzer@82d0ddb
Upstream diff: rust-lang/rust@1d72d7e...8afb6a8

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

Author: lnicola

crates/hir-def/src/lib.rs

@@ -15,6 +15,7 @@ extern crate rustc_parse_format;
 #[cfg(not(feature = "in-rust-tree"))]
 extern crate ra_ap_rustc_parse_format as rustc_parse_format;
 
+pub extern crate ra_ap_rustc_abi as layout;
 pub extern crate ra_ap_rustc_abi as rustc_abi;
 
 pub mod db;
@@ -48,7 +49,6 @@ pub mod import_map;
 pub mod visibility;
 
 use intern::Interned;
-pub use rustc_abi as layout;
 use rustc_abi::ExternAbi;
 use thin_vec::ThinVec;