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

Move Ty::builtin_deref

Browse source
This commit is contained in:
Lukas Wirth 2021-04-07 13:06:48 +02:00
parent a8f1e41f0f
commit e3a5c15d18
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/hir_ty/src/autoderef.rs
View file

@ -35,13 +35,21 @@ pub(crate) fn deref(
krate: CrateId, krate: CrateId,
ty: InEnvironment<&Canonical<Ty>>, ty: InEnvironment<&Canonical<Ty>>,
) -> Option<Canonical<Ty>> { ) -> Option<Canonical<Ty>> {
if let Some(derefed) = ty.goal.value.builtin_deref() { if let Some(derefed) = builtin_deref(&ty.goal.value) {
Some(Canonical { value: derefed, binders: ty.goal.binders.clone() }) Some(Canonical { value: derefed, binders: ty.goal.binders.clone() })
} else { } else {
deref_by_trait(db, krate, ty) deref_by_trait(db, krate, ty)
} }
} }
fn builtin_deref(ty: &Ty) -> Option<Ty> {
match ty.kind(&Interner) {
TyKind::Ref(.., ty) => Some(ty.clone()),
TyKind::Raw(.., ty) => Some(ty.clone()),
_ => None,
}
}
fn deref_by_trait( fn deref_by_trait(
db: &dyn HirDatabase, db: &dyn HirDatabase,
krate: CrateId, krate: CrateId,

8
crates/hir_ty/src/lib.rs
View file

@ -199,14 +199,6 @@ impl Ty {
} }
} }
fn builtin_deref(&self) -> Option<Ty> {
match self.kind(&Interner) {
TyKind::Ref(.., ty) => Some(ty.clone()),
TyKind::Raw(.., ty) => Some(ty.clone()),
_ => None,
}
}
/// Returns the type parameters of this type if it has some (i.e. is an ADT /// Returns the type parameters of this type if it has some (i.e. is an ADT
/// or function); so if `self` is `Option<u32>`, this returns the `u32`. /// or function); so if `self` is `Option<u32>`, this returns the `u32`.
pub fn substs(&self) -> Option<&Substitution> { pub fn substs(&self) -> Option<&Substitution> {