Unnamed repository; edit this file 'description' to name the repository.
Auto merge of #156190 - JonathanBrouwer:rollup-db0KRf1, r=JonathanBrouwer
Rollup of 7 pull requests
Successful merges:
- rust-lang/rust#156014 (resolve: Catch "cannot reexport" errors from macros 2.0 better)
- rust-lang/rust#156058 (Print HRTB binders before fn qualifiers)
- rust-lang/rust#156172 (Implement a new flag `-Zdisable-fast-paths` in trait solving)
- rust-lang/rust#156184 (Revert "remove `MethodReceiverExpr` special-casing")
- rust-lang/rust#155957 (Revert const hacks and use const closures in std)
- rust-lang/rust#156127 (Update `askama` version to `0.16.0`)
- rust-lang/rust#156183 (Remove duplicate debug assert)
| -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; |