Unnamed repository; edit this file 'description' to name the repository.
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.
| -rw-r--r-- | crates/hir-def/src/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/hir-def/src/lib.rs b/crates/hir-def/src/lib.rs index c98096769c..3aaf89102f 100644 --- a/crates/hir-def/src/lib.rs +++ b/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; |