aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2021-04-30 09:52:31 +0100
committerAleksey Kladov <[email protected]>2021-04-30 09:52:31 +0100
commitcb3ef552e873a86e94a3792160fadb5d937a6f5f (patch)
treeb19bf27eb2f6ed299d4095a43a8b618fbf347d7d /crates
parent49b219b1035e20143818d409404b5e6f19a7ad1d (diff)
internal: normalize name
All def types in hir are unsubstituted
Diffstat (limited to 'crates')
-rw-r--r--crates/hir/src/display.rs2
-rw-r--r--crates/hir/src/lib.rs2
-rw-r--r--crates/ide_assists/src/handlers/generate_from_impl_for_enum.rs2
-rw-r--r--crates/ide_completion/src/context.rs4
-rw-r--r--crates/ide_completion/src/render/enum_variant.rs2
5 files changed, 6 insertions, 6 deletions
diff --git a/crates/hir/src/display.rs b/crates/hir/src/display.rs
index 01a4d205f..508ac37c2 100644
--- a/crates/hir/src/display.rs
+++ b/crates/hir/src/display.rs
@@ -170,7 +170,7 @@ impl HirDisplay for Field {
170 fn hir_fmt(&self, f: &mut HirFormatter) -> Result<(), HirDisplayError> { 170 fn hir_fmt(&self, f: &mut HirFormatter) -> Result<(), HirDisplayError> {
171 write_visibility(self.parent.module(f.db).id, self.visibility(f.db), f)?; 171 write_visibility(self.parent.module(f.db).id, self.visibility(f.db), f)?;
172 write!(f, "{}: ", self.name(f.db))?; 172 write!(f, "{}: ", self.name(f.db))?;
173 self.signature_ty(f.db).hir_fmt(f) 173 self.ty(f.db).hir_fmt(f)
174 } 174 }
175} 175}
176 176
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index 0acfa582a..9eb7672da 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs
@@ -509,7 +509,7 @@ impl Field {
509 /// placeholder types for type parameters). This is good for showing 509 /// placeholder types for type parameters). This is good for showing
510 /// signature help, but not so good to actually get the type of the field 510 /// signature help, but not so good to actually get the type of the field
511 /// when you actually have a variable of the struct. 511 /// when you actually have a variable of the struct.
512 pub fn signature_ty(&self, db: &dyn HirDatabase) -> Type { 512 pub fn ty(&self, db: &dyn HirDatabase) -> Type {
513 let var_id = self.parent.into(); 513 let var_id = self.parent.into();
514 let generic_def_id: GenericDefId = match self.parent { 514 let generic_def_id: GenericDefId = match self.parent {
515 VariantDef::Struct(it) => it.id.into(), 515 VariantDef::Struct(it) => it.id.into(),
diff --git a/crates/ide_assists/src/handlers/generate_from_impl_for_enum.rs b/crates/ide_assists/src/handlers/generate_from_impl_for_enum.rs
index c13c6eebe..ce6998d82 100644
--- a/crates/ide_assists/src/handlers/generate_from_impl_for_enum.rs
+++ b/crates/ide_assists/src/handlers/generate_from_impl_for_enum.rs
@@ -91,7 +91,7 @@ fn existing_from_impl(
91 91
92 let enum_type = enum_.ty(sema.db); 92 let enum_type = enum_.ty(sema.db);
93 93
94 let wrapped_type = variant.fields(sema.db).get(0)?.signature_ty(sema.db); 94 let wrapped_type = variant.fields(sema.db).get(0)?.ty(sema.db);
95 95
96 if enum_type.impls_trait(sema.db, from_trait, &[wrapped_type]) { 96 if enum_type.impls_trait(sema.db, from_trait, &[wrapped_type]) {
97 Some(()) 97 Some(())
diff --git a/crates/ide_completion/src/context.rs b/crates/ide_completion/src/context.rs
index 32f81aec1..b005bd773 100644
--- a/crates/ide_completion/src/context.rs
+++ b/crates/ide_completion/src/context.rs
@@ -347,7 +347,7 @@ impl<'a> CompletionContext<'a> {
347 .and_then(|node| ast::RecordExprField::cast(node)) 347 .and_then(|node| ast::RecordExprField::cast(node))
348 .and_then(|rf| self.sema.resolve_record_field(&rf).zip(Some(rf))) 348 .and_then(|rf| self.sema.resolve_record_field(&rf).zip(Some(rf)))
349 .map(|(f, rf)|( 349 .map(|(f, rf)|(
350 Some(f.0.signature_ty(self.db)), 350 Some(f.0.ty(self.db)),
351 rf.field_name().map(NameOrNameRef::NameRef), 351 rf.field_name().map(NameOrNameRef::NameRef),
352 )) 352 ))
353 .unwrap_or((None, None)) 353 .unwrap_or((None, None))
@@ -357,7 +357,7 @@ impl<'a> CompletionContext<'a> {
357 self.sema 357 self.sema
358 .resolve_record_field(&it) 358 .resolve_record_field(&it)
359 .map(|f|( 359 .map(|f|(
360 Some(f.0.signature_ty(self.db)), 360 Some(f.0.ty(self.db)),
361 it.field_name().map(NameOrNameRef::NameRef), 361 it.field_name().map(NameOrNameRef::NameRef),
362 )) 362 ))
363 .unwrap_or((None, None)) 363 .unwrap_or((None, None))
diff --git a/crates/ide_completion/src/render/enum_variant.rs b/crates/ide_completion/src/render/enum_variant.rs
index 832f5ced1..0c0c71134 100644
--- a/crates/ide_completion/src/render/enum_variant.rs
+++ b/crates/ide_completion/src/render/enum_variant.rs
@@ -93,7 +93,7 @@ impl<'a> EnumRender<'a> {
93 .variant 93 .variant
94 .fields(self.ctx.db()) 94 .fields(self.ctx.db())
95 .into_iter() 95 .into_iter()
96 .map(|field| (field.name(self.ctx.db()), field.signature_ty(self.ctx.db()))); 96 .map(|field| (field.name(self.ctx.db()), field.ty(self.ctx.db())));
97 97
98 match self.variant_kind { 98 match self.variant_kind {
99 StructKind::Tuple | StructKind::Unit => format!( 99 StructKind::Tuple | StructKind::Unit => format!(