From d6f9e8806a26c5998a691974ba8e3655a2186766 Mon Sep 17 00:00:00 2001 From: Zac Pullar-Strecker Date: Tue, 30 Jun 2020 21:37:42 +1200 Subject: Remove unintentional changes --- crates/ra_hir/src/code_model.rs | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'crates/ra_hir/src') diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs index 839eb475e..56b2481e6 100644 --- a/crates/ra_hir/src/code_model.rs +++ b/crates/ra_hir/src/code_model.rs @@ -186,17 +186,18 @@ impl ModuleDef { module.visibility_of(db, self) } - pub fn name(&self, db: &dyn HirDatabase) -> Option { + pub fn name(self, db: &dyn HirDatabase) -> Option { match self { - ModuleDef::Module(m) => m.name(db), - ModuleDef::Function(m) => Some(m.name(db)), - ModuleDef::Adt(m) => Some(m.name(db)), - ModuleDef::EnumVariant(m) => Some(m.name(db)), - ModuleDef::Const(m) => m.name(db), - ModuleDef::Static(m) => m.name(db), - ModuleDef::Trait(m) => Some(m.name(db)), - ModuleDef::TypeAlias(m) => Some(m.name(db)), - ModuleDef::BuiltinType(m) => Some(m.as_name()), + ModuleDef::Adt(it) => Some(it.name(db)), + ModuleDef::Trait(it) => Some(it.name(db)), + ModuleDef::Function(it) => Some(it.name(db)), + ModuleDef::EnumVariant(it) => Some(it.name(db)), + ModuleDef::TypeAlias(it) => Some(it.name(db)), + ModuleDef::Module(it) => it.name(db), + ModuleDef::Const(it) => it.name(db), + ModuleDef::Static(it) => it.name(db), + + ModuleDef::BuiltinType(it) => Some(it.as_name()), } } -- cgit v1.2.3