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.rs36
1 files changed, 24 insertions, 12 deletions
diff --git a/crates/hir-ty/src/layout/tests.rs b/crates/hir-ty/src/layout/tests.rs
index ffac0879d8..7edd0fb6cc 100644
--- a/crates/hir-ty/src/layout/tests.rs
+++ b/crates/hir-ty/src/layout/tests.rs
@@ -44,21 +44,26 @@ fn eval_goal(
let adt_or_type_alias_id = scope.declarations().find_map(|x| match x {
hir_def::ModuleDefId::AdtId(x) => {
let name = match x {
- hir_def::AdtId::StructId(x) => {
- db.struct_data(x).name.display_no_db(file_id.edition()).to_smolstr()
- }
+ hir_def::AdtId::StructId(x) => db
+ .struct_signature(x)
+ .name
+ .display_no_db(file_id.edition())
+ .to_smolstr(),
hir_def::AdtId::UnionId(x) => {
- db.union_data(x).name.display_no_db(file_id.edition()).to_smolstr()
+ db.union_signature(x).name.display_no_db(file_id.edition()).to_smolstr()
}
hir_def::AdtId::EnumId(x) => {
- db.enum_data(x).name.display_no_db(file_id.edition()).to_smolstr()
+ db.enum_signature(x).name.display_no_db(file_id.edition()).to_smolstr()
}
};
(name == "Goal").then_some(Either::Left(x))
}
hir_def::ModuleDefId::TypeAliasId(x) => {
- let name =
- db.type_alias_data(x).name.display_no_db(file_id.edition()).to_smolstr();
+ let name = db
+ .type_alias_signature(x)
+ .name
+ .display_no_db(file_id.edition())
+ .to_smolstr();
(name == "Goal").then_some(Either::Right(x))
}
_ => None,
@@ -101,7 +106,8 @@ fn eval_expr(
.declarations()
.find_map(|x| match x {
hir_def::ModuleDefId::FunctionId(x) => {
- let name = db.function_data(x).name.display_no_db(file_id.edition()).to_smolstr();
+ let name =
+ db.function_signature(x).name.display_no_db(file_id.edition()).to_smolstr();
(name == "main").then_some(x)
}
_ => None,
@@ -512,10 +518,7 @@ fn niche_optimization() {
}
#[test]
-fn const_eval() {
- size_and_align! {
- struct Goal([i32; 2 + 2]);
- }
+fn const_eval_simple() {
size_and_align! {
const X: usize = 5;
struct Goal([i32; X]);
@@ -527,6 +530,15 @@ fn const_eval() {
struct Ar<T>([T; foo::BAR]);
struct Goal(Ar<Ar<i32>>);
}
+}
+
+#[test]
+// FIXME
+#[should_panic]
+fn const_eval_complex() {
+ size_and_align! {
+ struct Goal([i32; 2 + 2]);
+ }
size_and_align! {
type Goal = [u8; 2 + 2];
}