From 114a1b878e95c20490af574550ea0825b7a8f9d1 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Fri, 13 Sep 2019 00:34:52 +0300
Subject: rename AdtDef -> Adt

---
 crates/ra_ide_api/src/completion/complete_dot.rs     | 4 ++--
 crates/ra_ide_api/src/completion/complete_path.rs    | 8 ++++----
 crates/ra_ide_api/src/completion/complete_pattern.rs | 2 +-
 crates/ra_ide_api/src/completion/presentation.rs     | 8 +++-----
 4 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'crates/ra_ide_api/src/completion')

diff --git a/crates/ra_ide_api/src/completion/complete_dot.rs b/crates/ra_ide_api/src/completion/complete_dot.rs
index 2325cdf08..9e64c8659 100644
--- a/crates/ra_ide_api/src/completion/complete_dot.rs
+++ b/crates/ra_ide_api/src/completion/complete_dot.rs
@@ -1,4 +1,4 @@
-use hir::{AdtDef, Ty, TypeCtor};
+use hir::{Adt, Ty, TypeCtor};
 
 use crate::completion::completion_item::CompletionKind;
 use crate::{
@@ -37,7 +37,7 @@ fn complete_fields(acc: &mut Completions, ctx: &CompletionContext, receiver: Ty)
     for receiver in ctx.analyzer.autoderef(ctx.db, receiver) {
         if let Ty::Apply(a_ty) = receiver {
             match a_ty.ctor {
-                TypeCtor::Adt(AdtDef::Struct(s)) => {
+                TypeCtor::Adt(Adt::Struct(s)) => {
                     for field in s.fields(ctx.db) {
                         acc.add_field(ctx, field, &a_ty.parameters);
                     }
diff --git a/crates/ra_ide_api/src/completion/complete_path.rs b/crates/ra_ide_api/src/completion/complete_path.rs
index df14f465a..4d3414f33 100644
--- a/crates/ra_ide_api/src/completion/complete_path.rs
+++ b/crates/ra_ide_api/src/completion/complete_path.rs
@@ -1,4 +1,4 @@
-use hir::{AdtDef, Either, Resolution};
+use hir::{Adt, Either, Resolution};
 use ra_syntax::AstNode;
 use test_utils::tested_by;
 
@@ -37,14 +37,14 @@ pub(super) fn complete_path(acc: &mut Completions, ctx: &CompletionContext) {
                 acc.add_resolution(ctx, name.to_string(), &res.def.map(hir::Resolution::Def));
             }
         }
-        hir::ModuleDef::AdtDef(_) | hir::ModuleDef::TypeAlias(_) => {
-            if let hir::ModuleDef::AdtDef(AdtDef::Enum(e)) = def {
+        hir::ModuleDef::Adt(_) | hir::ModuleDef::TypeAlias(_) => {
+            if let hir::ModuleDef::Adt(Adt::Enum(e)) = def {
                 for variant in e.variants(ctx.db) {
                     acc.add_enum_variant(ctx, variant);
                 }
             }
             let ty = match def {
-                hir::ModuleDef::AdtDef(adt) => adt.ty(ctx.db),
+                hir::ModuleDef::Adt(adt) => adt.ty(ctx.db),
                 hir::ModuleDef::TypeAlias(a) => a.ty(ctx.db),
                 _ => unreachable!(),
             };
diff --git a/crates/ra_ide_api/src/completion/complete_pattern.rs b/crates/ra_ide_api/src/completion/complete_pattern.rs
index 05db973e4..fb7f9feb8 100644
--- a/crates/ra_ide_api/src/completion/complete_pattern.rs
+++ b/crates/ra_ide_api/src/completion/complete_pattern.rs
@@ -15,7 +15,7 @@ pub(super) fn complete_pattern(acc: &mut Completions, ctx: &CompletionContext) {
             _ => continue,
         };
         match def {
-            hir::ModuleDef::AdtDef(hir::AdtDef::Enum(..))
+            hir::ModuleDef::Adt(hir::Adt::Enum(..))
             | hir::ModuleDef::EnumVariant(..)
             | hir::ModuleDef::Const(..)
             | hir::ModuleDef::Module(..) => (),
diff --git a/crates/ra_ide_api/src/completion/presentation.rs b/crates/ra_ide_api/src/completion/presentation.rs
index e9bf2b96d..95bbd34b7 100644
--- a/crates/ra_ide_api/src/completion/presentation.rs
+++ b/crates/ra_ide_api/src/completion/presentation.rs
@@ -67,15 +67,13 @@ impl Completions {
             Resolution::Def(Function(func)) => {
                 return self.add_function_with_name(ctx, Some(local_name), *func);
             }
-            Resolution::Def(AdtDef(hir::AdtDef::Struct(it))) => {
+            Resolution::Def(Adt(hir::Adt::Struct(it))) => {
                 (CompletionItemKind::Struct, it.docs(ctx.db))
             }
-            Resolution::Def(AdtDef(hir::AdtDef::Union(it))) => {
+            Resolution::Def(Adt(hir::Adt::Union(it))) => {
                 (CompletionItemKind::Struct, it.docs(ctx.db))
             }
-            Resolution::Def(AdtDef(hir::AdtDef::Enum(it))) => {
-                (CompletionItemKind::Enum, it.docs(ctx.db))
-            }
+            Resolution::Def(Adt(hir::Adt::Enum(it))) => (CompletionItemKind::Enum, it.docs(ctx.db)),
             Resolution::Def(EnumVariant(it)) => (CompletionItemKind::EnumVariant, it.docs(ctx.db)),
             Resolution::Def(Const(it)) => (CompletionItemKind::Const, it.docs(ctx.db)),
             Resolution::Def(Static(it)) => (CompletionItemKind::Static, it.docs(ctx.db)),
-- 
cgit v1.2.3