aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/nameres.rs
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2019-03-26 11:54:05 +0000
committerAleksey Kladov <[email protected]>2019-03-26 11:54:05 +0000
commitf6f2d69bb8318815ff87cd1bfe504fe5aa09ed63 (patch)
tree7ed196ac7bdc372091afe07b9799479539c99f2c /crates/ra_hir/src/nameres.rs
parent0b820cacab020993b6e1667f491289122f03de04 (diff)
simplify
Diffstat (limited to 'crates/ra_hir/src/nameres.rs')
-rw-r--r--crates/ra_hir/src/nameres.rs6
1 files changed, 2 insertions, 4 deletions
diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs
index d8fa2383f..36ef615a3 100644
--- a/crates/ra_hir/src/nameres.rs
+++ b/crates/ra_hir/src/nameres.rs
@@ -61,9 +61,8 @@ use ra_db::{FileId, Edition};
61use test_utils::tested_by; 61use test_utils::tested_by;
62 62
63use crate::{ 63use crate::{
64 ModuleDef, Name, Crate, Module, 64 ModuleDef, Name, Crate, Module, SourceItemId,
65 DefDatabase, Path, PathKind, HirFileId, Trait, 65 DefDatabase, Path, PathKind, HirFileId, Trait,
66 SourceItemId, SourceFileItemId,
67 ids::{MacroCallId, MacroDefId}, 66 ids::{MacroCallId, MacroDefId},
68 diagnostics::DiagnosticSink, 67 diagnostics::DiagnosticSink,
69 nameres::diagnostics::DefDiagnostic, 68 nameres::diagnostics::DefDiagnostic,
@@ -242,9 +241,8 @@ impl CrateDefMap {
242 pub(crate) fn find_module_by_source( 241 pub(crate) fn find_module_by_source(
243 &self, 242 &self,
244 file_id: HirFileId, 243 file_id: HirFileId,
245 decl_id: Option<SourceFileItemId>, 244 decl_id: Option<SourceItemId>,
246 ) -> Option<CrateModuleId> { 245 ) -> Option<CrateModuleId> {
247 let decl_id = decl_id.map(|it| it.with_file_id(file_id));
248 let (module_id, _module_data) = self.modules.iter().find(|(_module_id, module_data)| { 246 let (module_id, _module_data) = self.modules.iter().find(|(_module_id, module_data)| {
249 if decl_id.is_some() { 247 if decl_id.is_some() {
250 module_data.declaration == decl_id 248 module_data.declaration == decl_id