itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-11-03 13:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
internal: Sync from downstream
This commit is contained in:
bors 2024-02-05 08:35:11 +00:00
commit 06737ec7ff
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/hir-ty/src/layout/target.rs
View File

@ -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;

2
crates/hir-ty/src/mir/eval.rs
View File

@ -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};

2
crates/hir-ty/src/utils.rs
View File

@ -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;