Unnamed repository; edit this file 'description' to name the repository.
Merge pull request #22338 from lnicola/sync-from-rust
minor: sync from downstream
| -rw-r--r-- | crates/hir-def/src/lib.rs | 2 | ||||
| -rw-r--r-- | rust-version | 2 |
2 files changed, 2 insertions, 2 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; diff --git a/rust-version b/rust-version index fb590a192f..1e8579c045 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -1d72d7e8136faaebad3a85eeed432e6ea1b2ffab +8afb6a8b1b32fce2f8aa7520517833338dc36c5e |