Merge #1835

1835: rename AdtDef -> Adt r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

1 files changed, 5 insertions, 7 deletions

diff --git a/crates/ra_ide_api/src/display/navigation_target.rs b/crates/ra_ide_api/src/display/navigation_target.rs
index c85214bb3..03382ab3c 100644
--- a/crates/ra_ide_api/src/display/navigation_target.rs
+++ b/crates/ra_ide_api/src/display/navigation_target.rs
@@ -178,11 +178,11 @@ impl NavigationTarget {
         )
     }
 
-    pub(crate) fn from_adt_def(db: &RootDatabase, adt_def: hir::AdtDef) -> NavigationTarget {
+    pub(crate) fn from_adt_def(db: &RootDatabase, adt_def: hir::Adt) -> NavigationTarget {
         match adt_def {
-            hir::AdtDef::Struct(it) => NavigationTarget::from_def_source(db, it),
-            hir::AdtDef::Union(it) => NavigationTarget::from_def_source(db, it),
-            hir::AdtDef::Enum(it) => NavigationTarget::from_def_source(db, it),
+            hir::Adt::Struct(it) => NavigationTarget::from_def_source(db, it),
+            hir::Adt::Union(it) => NavigationTarget::from_def_source(db, it),
+            hir::Adt::Enum(it) => NavigationTarget::from_def_source(db, it),
         }
     }
 
@@ -193,9 +193,7 @@ impl NavigationTarget {
         let nav = match module_def {
             hir::ModuleDef::Module(module) => NavigationTarget::from_module(db, module),
             hir::ModuleDef::Function(func) => NavigationTarget::from_def_source(db, func),
-            hir::ModuleDef::Struct(it) => NavigationTarget::from_adt_def(db, it.into()),
-            hir::ModuleDef::Enum(it) => NavigationTarget::from_adt_def(db, it.into()),
-            hir::ModuleDef::Union(it) => NavigationTarget::from_adt_def(db, it.into()),
+            hir::ModuleDef::Adt(it) => NavigationTarget::from_adt_def(db, it),
             hir::ModuleDef::Const(it) => NavigationTarget::from_def_source(db, it),
             hir::ModuleDef::Static(it) => NavigationTarget::from_def_source(db, it),
             hir::ModuleDef::EnumVariant(it) => NavigationTarget::from_def_source(db, it),