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

Don't use Substs for Ref/Raw/Array/Slice

Browse source
This commit is contained in:
Florian Diebold 2021-03-14 17:40:55 +01:00
parent af466f8542
commit 42217738e0
10 changed files with 103 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

34
crates/hir/src/lib.rs
View file

@ -1598,7 +1598,7 @@ impl Type {
pub fn remove_ref(&self) -> Option<Type> {
match &self.ty.value.interned(&Interner) {
TyKind::Ref(.., substs) => Some(self.derived(substs[0].clone())),
TyKind::Ref(.., ty) => Some(self.derived(ty.clone())),
_ => None,
}
}
@ -1752,10 +1752,30 @@ impl Type {
return go(&self.ty.value);
fn go(ty: &Ty) -> bool {
if ty.is_unknown() {
true
} else {
ty.substs().map_or(false, |substs| substs.iter().any(go))
match ty.interned(&Interner) {
TyKind::Unknown => true,
TyKind::Adt(_, substs)
| TyKind::AssociatedType(_, substs)
| TyKind::Tuple(_, substs)
| TyKind::OpaqueType(_, substs)
| TyKind::FnDef(_, substs)
| TyKind::Closure(_, substs) => substs.iter().any(go),
TyKind::Array(ty) | TyKind::Slice(ty) | TyKind::Raw(_, ty) | TyKind::Ref(_, ty) => {
go(ty)
}
TyKind::Scalar(_)
| TyKind::Str
| TyKind::Never
| TyKind::Placeholder(_)
| TyKind::BoundVar(_)
| TyKind::InferenceVar(_, _)
| TyKind::Dyn(_)
| TyKind::Function(_)
| TyKind::Alias(_)
| TyKind::ForeignType(_) => false,
}
}
}
@ -1990,6 +2010,10 @@ impl Type {
walk_bounds(db, &type_.derived(ty.clone()), bounds.as_ref(), cb);
}
TyKind::Ref(_, ty) | TyKind::Raw(_, ty) | TyKind::Array(ty) | TyKind::Slice(ty) => {
walk_type(db, &type_.derived(ty.clone()), cb);
}
_ => {}
}
if let Some(substs) = ty.substs() {