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

Remove ns-polymorphic type_for_def

Browse source
This commit is contained in:
Aleksey Kladov 2019-11-26 21:04:24 +03:00
parent 475367d08a
commit 4e415a269e
9 changed files with 129 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/ra_hir/src/code_model.rs
View file

@ -28,8 +28,7 @@ use crate::{
expr::{BindingAnnotation, Body, BodySourceMap, ExprValidator, Pat, PatId},
ty::display::HirFormatter,
ty::{
self, InEnvironment, InferenceResult, Namespace, TraitEnvironment, TraitRef, Ty, TypeCtor,
TypeWalk,
self, InEnvironment, InferenceResult, TraitEnvironment, TraitRef, Ty, TypeCtor, TypeWalk,
},
CallableDef, Either, HirDisplay, Name, Source,
};
@ -354,11 +353,11 @@ impl Struct {
}
pub fn ty(self, db: &impl HirDatabase) -> Ty {
db.type_for_def(self.into(), Namespace::Types)
db.ty(self.id.into())
}
pub fn constructor_ty(self, db: &impl HirDatabase) -> Ty {
db.type_for_def(self.into(), Namespace::Values)
db.value_ty(self.id.into())
}
fn variant_data(self, db: &impl DefDatabase) -> Arc<VariantData> {
@ -381,7 +380,7 @@ impl Union {
}
pub fn ty(self, db: &impl HirDatabase) -> Ty {
db.type_for_def(self.into(), Namespace::Types)
db.ty(self.id.into())
}
pub fn fields(self, db: &impl HirDatabase) -> Vec<StructField> {
@ -442,7 +441,7 @@ impl Enum {
}
pub fn ty(self, db: &impl HirDatabase) -> Ty {
db.type_for_def(self.into(), Namespace::Types)
db.ty(self.id.into())
}
}
@ -617,7 +616,7 @@ impl Function {
}
pub fn ty(self, db: &impl HirDatabase) -> Ty {
db.type_for_def(self.into(), Namespace::Values)
db.value_ty(self.id.into())
}
pub fn infer(self, db: &impl HirDatabase) -> Arc<InferenceResult> {
@ -797,7 +796,7 @@ impl TypeAlias {
}
pub fn ty(self, db: &impl HirDatabase) -> Ty {
db.type_for_def(self.into(), Namespace::Types)
db.ty(self.id.into())
}
pub fn name(self, db: &impl DefDatabase) -> Name {