From 5fd68b592938b6a4c074146c1b22ea0f6908fe26 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Mon, 25 Nov 2019 17:30:50 +0300
Subject: Fix hir for ast::UnionDef

---
 crates/ra_hir/src/code_model/src.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'crates/ra_hir/src/code_model')

diff --git a/crates/ra_hir/src/code_model/src.rs b/crates/ra_hir/src/code_model/src.rs
index a4e317c20..076d86f2b 100644
--- a/crates/ra_hir/src/code_model/src.rs
+++ b/crates/ra_hir/src/code_model/src.rs
@@ -51,13 +51,13 @@ impl HasSource for StructField {
 impl HasSource for Struct {
     type Ast = ast::StructDef;
     fn source(self, db: &impl DefDatabase) -> Source<ast::StructDef> {
-        self.id.0.source(db)
+        self.id.source(db)
     }
 }
 impl HasSource for Union {
-    type Ast = ast::StructDef;
-    fn source(self, db: &impl DefDatabase) -> Source<ast::StructDef> {
-        self.id.0.source(db)
+    type Ast = ast::UnionDef;
+    fn source(self, db: &impl DefDatabase) -> Source<ast::UnionDef> {
+        self.id.source(db)
     }
 }
 impl HasSource for Enum {
-- 
cgit v1.2.3


From d9a36a736bfb91578a36505e7237212959bb55fe Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Wed, 27 Nov 2019 21:31:51 +0300
Subject: Rename module_id -> local_id

---
 crates/ra_hir/src/code_model/src.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'crates/ra_hir/src/code_model')

diff --git a/crates/ra_hir/src/code_model/src.rs b/crates/ra_hir/src/code_model/src.rs
index 076d86f2b..bf3ee0834 100644
--- a/crates/ra_hir/src/code_model/src.rs
+++ b/crates/ra_hir/src/code_model/src.rs
@@ -22,7 +22,7 @@ impl Module {
     /// Returns a node which defines this module. That is, a file or a `mod foo {}` with items.
     pub fn definition_source(self, db: &impl DefDatabase) -> Source<ModuleSource> {
         let def_map = db.crate_def_map(self.id.krate);
-        let src = def_map[self.id.module_id].definition_source(db);
+        let src = def_map[self.id.local_id].definition_source(db);
         src.map(|it| match it {
             Either::A(it) => ModuleSource::SourceFile(it),
             Either::B(it) => ModuleSource::Module(it),
@@ -33,7 +33,7 @@ impl Module {
     /// `None` for the crate root.
     pub fn declaration_source(self, db: &impl DefDatabase) -> Option<Source<ast::Module>> {
         let def_map = db.crate_def_map(self.id.krate);
-        def_map[self.id.module_id].declaration_source(db)
+        def_map[self.id.local_id].declaration_source(db)
     }
 }
 
-- 
cgit v1.2.3