From f66e5b6e6b6f7b2b899ef4207dfe46655d77334c Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Wed, 28 Nov 2018 03:31:50 +0300
Subject: move ids to HIR

---
 crates/ra_analysis/src/hir/module/mod.rs     | 3 +--
 crates/ra_analysis/src/hir/module/nameres.rs | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'crates/ra_analysis/src/hir/module')

diff --git a/crates/ra_analysis/src/hir/module/mod.rs b/crates/ra_analysis/src/hir/module/mod.rs
index 683cb5d4c..d2096b01e 100644
--- a/crates/ra_analysis/src/hir/module/mod.rs
+++ b/crates/ra_analysis/src/hir/module/mod.rs
@@ -15,9 +15,8 @@ use relative_path::RelativePathBuf;
 
 use crate::{
     FileId, FilePosition, Cancelable,
-    hir::{Path, PathKind, HirDatabase, SourceItemId},
+    hir::{DefLoc, DefId, Path, PathKind, HirDatabase, SourceItemId},
     arena::{Arena, Id},
-    loc2id::{DefLoc, DefId},
 };
 
 pub(crate) use self::nameres::ModuleScope;
diff --git a/crates/ra_analysis/src/hir/module/nameres.rs b/crates/ra_analysis/src/hir/module/nameres.rs
index 5c87e7af2..d4ecc010b 100644
--- a/crates/ra_analysis/src/hir/module/nameres.rs
+++ b/crates/ra_analysis/src/hir/module/nameres.rs
@@ -28,8 +28,8 @@ use ra_db::SourceRootId;
 
 use crate::{
     Cancelable, FileId,
-    loc2id::{DefId, DefLoc},
     hir::{
+        DefId, DefLoc,
         SourceItemId, SourceFileItemId, SourceFileItems,
         Path, PathKind,
         HirDatabase,
-- 
cgit v1.2.3