2 files changed, 17 insertions, 14 deletions

diff --git a/crates/ra_ide_api/src/display/navigation_target.rs b/crates/ra_ide_api/src/display/navigation_target.rs
index cfd3f5478..c02bc005b 100644
--- a/crates/ra_ide_api/src/display/navigation_target.rs
+++ b/crates/ra_ide_api/src/display/navigation_target.rs
@@ -189,12 +189,12 @@ impl NavigationTarget {
     pub(crate) fn from_adt_def(db: &RootDatabase, adt_def: hir::AdtDef) -> NavigationTarget {
         match adt_def {
             hir::AdtDef::Struct(s) => {
-                let (file_id, node) = s.source(db);
+                let src = s.source(db);
                 NavigationTarget::from_named(
-                    file_id.original_file(db),
-                    &*node,
-                    node.doc_comment_text(),
-                    node.short_label(),
+                    src.file_id.original_file(db),
+                    &*src.ast,
+                    src.ast.doc_comment_text(),
+                    src.ast.short_label(),
                 )
             }
             hir::AdtDef::Union(s) => {
@@ -226,12 +226,12 @@ impl NavigationTarget {
             hir::ModuleDef::Module(module) => NavigationTarget::from_module(db, module),
             hir::ModuleDef::Function(func) => NavigationTarget::from_function(db, func),
             hir::ModuleDef::Struct(s) => {
-                let (file_id, node) = s.source(db);
+                let src = s.source(db);
                 NavigationTarget::from_named(
-                    file_id.original_file(db),
-                    &*node,
-                    node.doc_comment_text(),
-                    node.short_label(),
+                    src.file_id.original_file(db),
+                    &*src.ast,
+                    src.ast.doc_comment_text(),
+                    src.ast.short_label(),
                 )
             }
             hir::ModuleDef::Union(s) => {
diff --git a/crates/ra_ide_api/src/hover.rs b/crates/ra_ide_api/src/hover.rs
index fbabeb194..80445761c 100644
--- a/crates/ra_ide_api/src/hover.rs
+++ b/crates/ra_ide_api/src/hover.rs
@@ -136,8 +136,8 @@ pub(crate) fn hover(db: &RootDatabase, position: FilePosition) -> Option<RangeIn
                         res.extend(hover_text(it.doc_comment_text(), it.short_label()))
                     }
                     hir::ModuleDef::Struct(it) => {
-                        let it = it.source(db).1;
-                        res.extend(hover_text(it.doc_comment_text(), it.short_label()))
+                        let src = it.source(db);
+                        res.extend(hover_text(src.ast.doc_comment_text(), src.ast.short_label()))
                     }
                     hir::ModuleDef::Union(it) => {
                         let it = it.source(db).1;
@@ -176,8 +176,11 @@ pub(crate) fn hover(db: &RootDatabase, position: FilePosition) -> Option<RangeIn
                 if let Some((adt_def, _)) = ty.as_adt() {
                     match adt_def {
                         hir::AdtDef::Struct(it) => {
-                            let it = it.source(db).1;
-                            res.extend(hover_text(it.doc_comment_text(), it.short_label()))
+                            let src = it.source(db);
+                            res.extend(hover_text(
+                                src.ast.doc_comment_text(),
+                                src.ast.short_label(),
+                            ))
                         }
                         hir::AdtDef::Union(it) => {
                             let it = it.source(db).1;