From 1a6f51da66f16a46eb5fd80dc6ea0a2c179d5ff2 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Mon, 2 Mar 2020 19:03:32 +0100 Subject: Simplify: remove couple of useless functions --- crates/ra_ide_db/src/defs.rs | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) (limited to 'crates/ra_ide_db/src') diff --git a/crates/ra_ide_db/src/defs.rs b/crates/ra_ide_db/src/defs.rs index ad4638906..7b1030a14 100644 --- a/crates/ra_ide_db/src/defs.rs +++ b/crates/ra_ide_db/src/defs.rs @@ -111,47 +111,47 @@ fn classify_name_inner(sema: &Semantics, name: &ast::Name) -> Opti }, ast::RecordFieldDef(it) => { let field: hir::StructField = sema.to_def(&it)?; - Some(from_struct_field(field)) + Some(NameDefinition::StructField(field)) }, ast::Module(it) => { let def = sema.to_def(&it)?; - Some(from_module_def(def.into())) + Some(NameDefinition::ModuleDef(def.into())) }, ast::StructDef(it) => { let def: hir::Struct = sema.to_def(&it)?; - Some(from_module_def(def.into())) + Some(NameDefinition::ModuleDef(def.into())) }, ast::UnionDef(it) => { let def: hir::Union = sema.to_def(&it)?; - Some(from_module_def(def.into())) + Some(NameDefinition::ModuleDef(def.into())) }, ast::EnumDef(it) => { let def: hir::Enum = sema.to_def(&it)?; - Some(from_module_def(def.into())) + Some(NameDefinition::ModuleDef(def.into())) }, ast::TraitDef(it) => { let def: hir::Trait = sema.to_def(&it)?; - Some(from_module_def(def.into())) + Some(NameDefinition::ModuleDef(def.into())) }, ast::StaticDef(it) => { let def: hir::Static = sema.to_def(&it)?; - Some(from_module_def(def.into())) + Some(NameDefinition::ModuleDef(def.into())) }, ast::EnumVariant(it) => { let def: hir::EnumVariant = sema.to_def(&it)?; - Some(from_module_def(def.into())) + Some(NameDefinition::ModuleDef(def.into())) }, ast::FnDef(it) => { let def: hir::Function = sema.to_def(&it)?; - Some(from_module_def(def.into())) + Some(NameDefinition::ModuleDef(def.into())) }, ast::ConstDef(it) => { let def: hir::Const = sema.to_def(&it)?; - Some(from_module_def(def.into())) + Some(NameDefinition::ModuleDef(def.into())) }, ast::TypeAliasDef(it) => { let def: hir::TypeAlias = sema.to_def(&it)?; - Some(from_module_def(def.into())) + Some(NameDefinition::ModuleDef(def.into())) }, ast::MacroCall(it) => { let def = sema.to_def(&it)?; @@ -165,11 +165,3 @@ fn classify_name_inner(sema: &Semantics, name: &ast::Name) -> Opti } } } - -pub fn from_struct_field(field: StructField) -> NameDefinition { - NameDefinition::StructField(field) -} - -pub fn from_module_def(def: ModuleDef) -> NameDefinition { - NameDefinition::ModuleDef(def) -} -- cgit v1.2.3