language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 20:42:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix code_model::Type::walk not walking all types

Browse source
This commit is contained in:
Lukas Wirth 2021-02-28 19:46:59 +01:00
parent a3f5491a1a
commit faf2dd49e4
3 changed files with 25 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/hir/src/code_model.rs
View file

@ -1924,21 +1924,18 @@ impl Type {
fn walk_type(db: &dyn HirDatabase, type_: &Type, cb: &mut impl FnMut(Type)) {
let ty = type_.ty.value.strip_references();
match ty {
Ty::Adt(_, parameters) => {
Ty::Adt(..) => {
cb(type_.derived(ty.clone()));
walk_substs(db, type_, parameters, cb);
}
Ty::AssociatedType(_, parameters) => {
Ty::AssociatedType(..) => {
if let Some(_) = ty.associated_type_parent_trait(db) {
cb(type_.derived(ty.clone()));
}
walk_substs(db, type_, parameters, cb);
}
Ty::OpaqueType(_, parameters) => {
Ty::OpaqueType(..) => {
if let Some(bounds) = ty.impl_trait_bounds(db) {
walk_bounds(db, &type_.derived(ty.clone()), &bounds, cb);
}
walk_substs(db, type_, parameters, cb);
}
Ty::Opaque(opaque_ty) => {
if let Some(bounds) = ty.impl_trait_bounds(db) {
@ -1956,7 +1953,10 @@ impl Type {
walk_bounds(db, &type_.derived(ty.clone()), bounds.as_ref(), cb);
}
_ => (),
_ => {}
}
if let Some(substs) = ty.substs() {
walk_substs(db, type_, &substs, cb);
}
}