bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-ty/src/layout/tests.rs')
-rw-r--r--crates/hir-ty/src/layout/tests.rs20
1 files changed, 10 insertions, 10 deletions
diff --git a/crates/hir-ty/src/layout/tests.rs b/crates/hir-ty/src/layout/tests.rs
index f40d508f75..66159ddce2 100644
--- a/crates/hir-ty/src/layout/tests.rs
+++ b/crates/hir-ty/src/layout/tests.rs
@@ -1,7 +1,7 @@
use chalk_ir::{AdtId, TyKind};
use either::Either;
use hir_def::db::DefDatabase;
-use project_model::{target_data_layout::RustcDataLayoutConfig, Sysroot};
+use project_model::{toolchain_info::QueryConfig, Sysroot};
use rustc_hash::FxHashMap;
use syntax::ToSmolStr;
use test_fixture::WithFixture;
@@ -17,8 +17,8 @@ use crate::{
mod closure;
fn current_machine_data_layout() -> String {
- project_model::target_data_layout::get(
- RustcDataLayoutConfig::Rustc(&Sysroot::empty()),
+ project_model::toolchain_info::target_data_layout::get(
+ QueryConfig::Rustc(&Sysroot::empty(), &std::env::current_dir().unwrap()),
None,
&FxHashMap::default(),
)
@@ -241,31 +241,31 @@ fn recursive() {
#[test]
fn repr_packed() {
size_and_align! {
- #[repr(packed)]
+ #[repr(Rust, packed)]
struct Goal;
}
size_and_align! {
- #[repr(packed(2))]
+ #[repr(Rust, packed(2))]
struct Goal;
}
size_and_align! {
- #[repr(packed(4))]
+ #[repr(Rust, packed(4))]
struct Goal;
}
size_and_align! {
- #[repr(packed)]
+ #[repr(Rust, packed)]
struct Goal(i32);
}
size_and_align! {
- #[repr(packed(2))]
+ #[repr(Rust, packed(2))]
struct Goal(i32);
}
size_and_align! {
- #[repr(packed(4))]
+ #[repr(Rust, packed(4))]
struct Goal(i32);
}
- check_size_and_align("#[repr(packed(5))] struct Goal(i32);", "", 4, 1);
+ check_size_and_align("#[repr(Rust, packed(5))] struct Goal(i32);", "", 4, 1);
}
#[test]