Auto merge of #16492 - lnicola:sync-from-rust, r=lnicola

internal: Sync from downstream

3 files changed, 3 insertions, 3 deletions

diff --git a/crates/hir-ty/src/layout/target.rs b/crates/hir-ty/src/layout/target.rs
index b67bb6c8661..5bfe7bf010f 100644
--- a/crates/hir-ty/src/layout/target.rs
+++ b/crates/hir-ty/src/layout/target.rs
@@ -2,7 +2,7 @@
 
 use base_db::CrateId;
 use hir_def::layout::TargetDataLayout;
-use ra_ap_rustc_abi::{AlignFromBytesError, TargetDataLayoutErrors};
+use rustc_abi::{AlignFromBytesError, TargetDataLayoutErrors};
 use triomphe::Arc;
 
 use crate::db::HirDatabase;
diff --git a/crates/hir-ty/src/mir/eval.rs b/crates/hir-ty/src/mir/eval.rs
index 84ee60b56b2..50c4d00660b 100644
--- a/crates/hir-ty/src/mir/eval.rs
+++ b/crates/hir-ty/src/mir/eval.rs
@@ -17,7 +17,7 @@ use hir_def::{
 use hir_expand::{mod_path::ModPath, HirFileIdExt, InFile};
 use intern::Interned;
 use la_arena::ArenaMap;
-use ra_ap_rustc_abi::TargetDataLayout;
+use rustc_abi::TargetDataLayout;
 use rustc_hash::{FxHashMap, FxHashSet};
 use stdx::never;
 use syntax::{SyntaxNodePtr, TextRange};
diff --git a/crates/hir-ty/src/utils.rs b/crates/hir-ty/src/utils.rs
index c0ca9d713ca..c150314138a 100644
--- a/crates/hir-ty/src/utils.rs
+++ b/crates/hir-ty/src/utils.rs
@@ -24,7 +24,7 @@ use hir_def::{
 };
 use hir_expand::name::Name;
 use intern::Interned;
-use ra_ap_rustc_abi::TargetDataLayout;
+use rustc_abi::TargetDataLayout;
 use rustc_hash::FxHashSet;
 use smallvec::{smallvec, SmallVec};
 use stdx::never;