From f8dde21fe9ccceea0b3dea83d646a45a409a0e3f Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 6 Feb 2020 16:00:39 +0100
Subject: Simplify

---
 crates/ra_ide/src/imports_locator.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'crates/ra_ide/src/imports_locator.rs')

diff --git a/crates/ra_ide/src/imports_locator.rs b/crates/ra_ide/src/imports_locator.rs
index cfd58aafe..23bf43b07 100644
--- a/crates/ra_ide/src/imports_locator.rs
+++ b/crates/ra_ide/src/imports_locator.rs
@@ -11,7 +11,7 @@ use ra_prof::profile;
 use ra_syntax::{ast, AstNode, SyntaxKind::NAME};
 
 use crate::{
-    references::{classify_name, NameDefinition, NameKind},
+    references::{classify_name, NameKind},
     Query,
 };
 
@@ -28,7 +28,7 @@ impl<'a> ImportsLocatorIde<'a> {
         &mut self,
         db: &impl HirDatabase,
         import_candidate: &FileSymbol,
-    ) -> Option<NameDefinition> {
+    ) -> Option<NameKind> {
         let _p = profile("get_name_definition");
         let file_id = import_candidate.file_id.into();
         let candidate_node = import_candidate.ptr.to_node(&db.parse_or_expand(file_id)?);
@@ -41,6 +41,7 @@ impl<'a> ImportsLocatorIde<'a> {
             &mut self.source_binder,
             hir::InFile { file_id, value: &ast::Name::cast(candidate_name_node)? },
         )
+        .map(|it| it.kind)
     }
 }
 
@@ -67,7 +68,7 @@ impl ImportsLocator for ImportsLocatorIde<'_> {
             .into_iter()
             .chain(lib_results.into_iter())
             .filter_map(|import_candidate| self.get_name_definition(db, &import_candidate))
-            .filter_map(|name_definition_to_import| match name_definition_to_import.kind {
+            .filter_map(|name_definition_to_import| match name_definition_to_import {
                 NameKind::Def(module_def) => Some(module_def),
                 _ => None,
             })
-- 
cgit v1.2.3