Unnamed repository; edit this file 'description' to name the repository.
Merge ref '4ddd4538a881' from rust-lang/rust
Pull recent changes from https://github.com/rust-lang/rust via Josh.
Upstream ref: rust-lang/rust@4ddd4538a881317c622ed674b08300b8fc8dabdd
Filtered ref: rust-lang/miri@99593b482e0d8afa02da85dc5f36c2677542809b
Upstream diff: https://github.com/rust-lang/rust/compare/045b17737dab5fcc28e4cbee0cfe2ce4ed363b32...4ddd4538a881317c622ed674b08300b8fc8dabdd
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 9a7fbc812f..22c9073a58 100644 --- a/crates/hir-def/src/lib.rs +++ b/crates/hir-def/src/lib.rs @@ -16,6 +16,7 @@ extern crate rustc_parse_format; extern crate ra_ap_rustc_parse_format as rustc_parse_format; extern crate ra_ap_rustc_abi as rustc_abi; +pub extern crate ra_ap_rustc_abi as layout; pub mod db; @@ -47,7 +48,6 @@ pub mod import_map; pub mod visibility; use intern::{Interned, Symbol}; -pub use rustc_abi as layout; use thin_vec::ThinVec; pub use crate::signatures::LocalFieldId; |