From 14ea21617ab510daa4f88b0f7c93fdfd2d36e42d Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sat, 29 Feb 2020 18:34:34 +0100
Subject: Minor

---
 crates/ra_hir/src/code_model.rs | 7 +++----
 crates/ra_hir/src/from_id.rs    | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'crates')

diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs
index a9615a3b7..034fb7cfa 100644
--- a/crates/ra_hir/src/code_model.rs
+++ b/crates/ra_hir/src/code_model.rs
@@ -778,8 +778,7 @@ impl GenericDef {
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub struct Local {
-    // TODO: ID,
-    pub(crate) parent: DefWithBody,
+    pub(crate) parent: DefWithBodyId,
     pub(crate) pat_id: PatId,
 }
 
@@ -808,11 +807,11 @@ impl Local {
     }
 
     pub fn parent(self, _db: &impl HirDatabase) -> DefWithBody {
-        self.parent
+        self.parent.into()
     }
 
     pub fn module(self, db: &impl HirDatabase) -> Module {
-        self.parent.module(db)
+        self.parent(db).module(db)
     }
 
     pub fn ty(self, db: &impl HirDatabase) -> Type {
diff --git a/crates/ra_hir/src/from_id.rs b/crates/ra_hir/src/from_id.rs
index 88540fbf2..cbfa91d6c 100644
--- a/crates/ra_hir/src/from_id.rs
+++ b/crates/ra_hir/src/from_id.rs
@@ -225,6 +225,6 @@ impl From<AssocItem> for GenericDefId {
 
 impl From<(DefWithBodyId, PatId)> for Local {
     fn from((parent, pat_id): (DefWithBodyId, PatId)) -> Self {
-        Local { parent: parent.into(), pat_id }
+        Local { parent, pat_id }
     }
 }
-- 
cgit v1.2.3