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

Merge pull request #19173 from rust-lang/revert-19122-master

Browse Source 
Revert "pass struct fields to chalk"
This commit is contained in:
Lukas Wirth 2025-02-18 10:53:35 +00:00 committed by GitHub
commit 957d3450da
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 20 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crates/hir-ty/src/chalk_db.rs
View File

@ -768,21 +768,23 @@ pub(crate) fn adt_datum_query(
phantom_data, phantom_data,
}; };
let variant_id_to_fields = |id: VariantId| { // this slows down rust-analyzer by quite a bit unfortunately, so enabling this is currently not worth it
let _variant_id_to_fields = |id: VariantId| {
let variant_data = &id.variant_data(db.upcast()); let variant_data = &id.variant_data(db.upcast());
let fields = if variant_data.fields().is_empty() || bound_vars_subst.is_empty(Interner) { let fields = if variant_data.fields().is_empty() {
vec![] vec![]
} else { } else {
// HACK: provide full struct type info slows down rust-analyzer by quite a bit unfortunately, let field_types = db.field_types(id);
// so we trick chalk into thinking that our struct impl Unsize variant_data
if let Some(ty) = bound_vars_subst.at(Interner, 0).ty(Interner) { .fields()
vec![ty.clone()] .iter()
} else { .map(|(idx, _)| field_types[idx].clone().substitute(Interner, &bound_vars_subst))
vec![] .filter(|it| !it.contains_unknown())
} .collect()
}; };
rust_ir::AdtVariantDatum { fields } rust_ir::AdtVariantDatum { fields }
}; };
let variant_id_to_fields = |_: VariantId| rust_ir::AdtVariantDatum { fields: vec![] };
let (kind, variants) = match adt_id { let (kind, variants) = match adt_id {
hir_def::AdtId::StructId(id) => { hir_def::AdtId::StructId(id) => {

25
crates/hir-ty/src/tests/coercion.rs
View File

@ -535,7 +535,7 @@ fn test() {
#[test] #[test]
fn coerce_unsize_generic() { fn coerce_unsize_generic() {
check_no_mismatches( check(
r#" r#"
//- minicore: coerce_unsized //- minicore: coerce_unsized
struct Foo<T> { t: T }; struct Foo<T> { t: T };
@ -543,7 +543,9 @@ struct Bar<T>(Foo<T>);
fn test() { fn test() {
let _: &Foo<[usize]> = &Foo { t: [1, 2, 3] }; let _: &Foo<[usize]> = &Foo { t: [1, 2, 3] };
//^^^^^^^^^^^^^^^^^^^^^ expected &'? Foo<[usize]>, got &'? Foo<[i32; 3]>
let _: &Bar<[usize]> = &Bar(Foo { t: [1, 2, 3] }); let _: &Bar<[usize]> = &Bar(Foo { t: [1, 2, 3] });
//^^^^^^^^^^^^^^^^^^^^^^^^^^ expected &'? Bar<[usize]>, got &'? Bar<[i32; 3]>
} }
"#, "#,
); );
@ -955,24 +957,3 @@ fn f() {
"#, "#,
); );
} }
#[test]
fn coerce_nested_unsized_struct() {
check_types(
r#"
//- minicore: fn, coerce_unsized, dispatch_from_dyn, sized
use core::marker::Unsize;
struct Foo<T: ?Sized>(T);
fn need(_: &Foo<dyn Fn(i32) -> i32>) {
}
fn test() {
let callback = |x| x;
//^ i32
need(&Foo(callback));
}
"#,
)
}

12
crates/hir-ty/src/tests/traits.rs
View File

@ -4694,21 +4694,21 @@ fn f<T: Send, U>() {
Struct::<T>::IS_SEND; Struct::<T>::IS_SEND;
//^^^^^^^^^^^^^^^^^^^^Yes //^^^^^^^^^^^^^^^^^^^^Yes
Struct::<U>::IS_SEND; Struct::<U>::IS_SEND;
//^^^^^^^^^^^^^^^^^^^^{unknown} //^^^^^^^^^^^^^^^^^^^^Yes
Struct::<*const T>::IS_SEND; Struct::<*const T>::IS_SEND;
//^^^^^^^^^^^^^^^^^^^^^^^^^^^{unknown} //^^^^^^^^^^^^^^^^^^^^^^^^^^^Yes
Enum::<T>::IS_SEND; Enum::<T>::IS_SEND;
//^^^^^^^^^^^^^^^^^^Yes //^^^^^^^^^^^^^^^^^^Yes
Enum::<U>::IS_SEND; Enum::<U>::IS_SEND;
//^^^^^^^^^^^^^^^^^^{unknown} //^^^^^^^^^^^^^^^^^^Yes
Enum::<*const T>::IS_SEND; Enum::<*const T>::IS_SEND;
//^^^^^^^^^^^^^^^^^^^^^^^^^{unknown} //^^^^^^^^^^^^^^^^^^^^^^^^^Yes
Union::<T>::IS_SEND; Union::<T>::IS_SEND;
//^^^^^^^^^^^^^^^^^^^Yes //^^^^^^^^^^^^^^^^^^^Yes
Union::<U>::IS_SEND; Union::<U>::IS_SEND;
//^^^^^^^^^^^^^^^^^^^{unknown} //^^^^^^^^^^^^^^^^^^^Yes
Union::<*const T>::IS_SEND; Union::<*const T>::IS_SEND;
//^^^^^^^^^^^^^^^^^^^^^^^^^^{unknown} //^^^^^^^^^^^^^^^^^^^^^^^^^^Yes
PhantomData::<T>::IS_SEND; PhantomData::<T>::IS_SEND;
//^^^^^^^^^^^^^^^^^^^^^^^^^Yes //^^^^^^^^^^^^^^^^^^^^^^^^^Yes
PhantomData::<U>::IS_SEND; PhantomData::<U>::IS_SEND;