diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-12-20 07:06:55 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-12-20 07:06:55 +0000 |
commit | f3125555a8de6fad4529408436800a6b1243a442 (patch) | |
tree | 6cc2943b901f35ea3c351490f15cad9061a69c15 /crates/ide_db/src/defs.rs | |
parent | 87886e89867d36c14812e70505c4db61a6b66bf0 (diff) | |
parent | f6ed16674c461cb20c39e787fffab2269b9629b0 (diff) |
Merge #6958
6958: Align code_model name with ungrammar r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ide_db/src/defs.rs')
-rw-r--r-- | crates/ide_db/src/defs.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ide_db/src/defs.rs b/crates/ide_db/src/defs.rs index bd2afc887..9d7dce1d4 100644 --- a/crates/ide_db/src/defs.rs +++ b/crates/ide_db/src/defs.rs | |||
@@ -66,7 +66,7 @@ impl Definition { | |||
66 | hir::Adt::Union(it) => it.name(db), | 66 | hir::Adt::Union(it) => it.name(db), |
67 | hir::Adt::Enum(it) => it.name(db), | 67 | hir::Adt::Enum(it) => it.name(db), |
68 | }, | 68 | }, |
69 | hir::ModuleDef::EnumVariant(it) => it.name(db), | 69 | hir::ModuleDef::Variant(it) => it.name(db), |
70 | hir::ModuleDef::Const(it) => it.name(db)?, | 70 | hir::ModuleDef::Const(it) => it.name(db)?, |
71 | hir::ModuleDef::Static(it) => it.name(db)?, | 71 | hir::ModuleDef::Static(it) => it.name(db)?, |
72 | hir::ModuleDef::Trait(it) => it.name(db), | 72 | hir::ModuleDef::Trait(it) => it.name(db), |
@@ -207,7 +207,7 @@ impl NameClass { | |||
207 | Some(NameClass::Definition(Definition::ModuleDef(def.into()))) | 207 | Some(NameClass::Definition(Definition::ModuleDef(def.into()))) |
208 | }, | 208 | }, |
209 | ast::Variant(it) => { | 209 | ast::Variant(it) => { |
210 | let def: hir::EnumVariant = sema.to_def(&it)?; | 210 | let def: hir::Variant = sema.to_def(&it)?; |
211 | Some(NameClass::Definition(Definition::ModuleDef(def.into()))) | 211 | Some(NameClass::Definition(Definition::ModuleDef(def.into()))) |
212 | }, | 212 | }, |
213 | ast::Fn(it) => { | 213 | ast::Fn(it) => { |