language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 06:41:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix panic on GAT

Browse source 
Signed-off-by: Alex Chi <iskyzh@gmail.com>
This commit is contained in:
Alex Chi 2022-04-11 13:44:01 +08:00
parent 24cf957627
commit 51d66714ac
2 changed files with 37 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
crates/hir_ty/src/utils.rs
View file

@ -176,13 +176,22 @@ pub(super) fn associated_type_by_name_including_super_traits(
pub(crate) fn generics(db: &dyn DefDatabase, def: GenericDefId) -> Generics {
let parent_generics = parent_generic_def(db, def).map(|def| Box::new(generics(db, def)));
if parent_generics.is_some() && matches!(def, GenericDefId::TypeAliasId(_)) {
// XXX: treat generic associated types as not existing to avoid crashes (#)
//
// Chalk expects the inner associated type's parameters to come
// *before*, not after the trait's generics as we've always done it.
// Adapting to this requires a larger refactoring
cov_mark::hit!(ignore_gats);
return Generics { def, params: Interned::new(Default::default()), parent_generics };
let params = db.generic_params(def);
if params
.type_or_consts
.iter()
.any(|(_, x)| matches!(x, TypeOrConstParamData::ConstParamData(_)))
{
// XXX: treat const generic associated types as not existing to avoid crashes (#11769)
//
// Chalk expects the inner associated type's parameters to come
// *before*, not after the trait's generics as we've always done it.
// Adapting to this requires a larger refactoring
cov_mark::hit!(ignore_gats);
return Generics { def, params: Interned::new(Default::default()), parent_generics };
} else {
return Generics { def, params, parent_generics };
}
}
Generics { def, params: db.generic_params(def), parent_generics }
}