From 2ae31e34b1a345ceea23198a7e9e32e557cdbb4d Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 17 Dec 2020 14:36:15 +0300 Subject: Rename ImplDef -> Impl We used to have `Def` suffix for all symbols, but we moved off from that. `FunctionDef` isn't better than `Function`. Looks like we've forgot to change `Impl` though! --- crates/ide/src/display/navigation_target.rs | 2 +- crates/ide/src/doc_links.rs | 2 +- crates/ide/src/goto_implementation.rs | 6 +++--- crates/ide/src/hover.rs | 2 +- crates/ide/src/runnables.rs | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'crates/ide') diff --git a/crates/ide/src/display/navigation_target.rs b/crates/ide/src/display/navigation_target.rs index ce0f4214c..54b33a98e 100644 --- a/crates/ide/src/display/navigation_target.rs +++ b/crates/ide/src/display/navigation_target.rs @@ -245,7 +245,7 @@ impl ToNav for hir::Module { } } -impl ToNav for hir::ImplDef { +impl ToNav for hir::Impl { fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { let src = self.source(db); let derive_attr = self.is_builtin_derive(db); diff --git a/crates/ide/src/doc_links.rs b/crates/ide/src/doc_links.rs index 2b5794a31..79c081cac 100644 --- a/crates/ide/src/doc_links.rs +++ b/crates/ide/src/doc_links.rs @@ -112,7 +112,7 @@ fn get_doc_link(db: &RootDatabase, definition: Definition) -> Option { .as_assoc_item(db) .and_then(|assoc| match assoc.container(db) { AssocItemContainer::Trait(t) => Some(t.into()), - AssocItemContainer::ImplDef(impld) => { + AssocItemContainer::Impl(impld) => { impld.target_ty(db).as_adt().map(|adt| adt.into()) } }) diff --git a/crates/ide/src/goto_implementation.rs b/crates/ide/src/goto_implementation.rs index 68c628d31..6eac39639 100644 --- a/crates/ide/src/goto_implementation.rs +++ b/crates/ide/src/goto_implementation.rs @@ -1,4 +1,4 @@ -use hir::{Crate, ImplDef, Semantics}; +use hir::{Crate, Impl, Semantics}; use ide_db::RootDatabase; use syntax::{algo::find_node_at_offset, ast, AstNode}; @@ -49,7 +49,7 @@ fn impls_for_def( ast::AdtDef::Union(def) => sema.to_def(def)?.ty(sema.db), }; - let impls = ImplDef::all_in_crate(sema.db, krate); + let impls = Impl::all_in_crate(sema.db, krate); Some( impls @@ -67,7 +67,7 @@ fn impls_for_trait( ) -> Option> { let tr = sema.to_def(node)?; - let impls = ImplDef::for_trait(sema.db, krate, tr); + let impls = Impl::for_trait(sema.db, krate, tr); Some(impls.into_iter().map(|imp| imp.to_nav(sema.db)).collect()) } diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs index a01b0c894..e82aad6d5 100644 --- a/crates/ide/src/hover.rs +++ b/crates/ide/src/hover.rs @@ -295,7 +295,7 @@ fn definition_owner_name(db: &RootDatabase, def: &Definition) -> Option Definition::ModuleDef(md) => match md { ModuleDef::Function(f) => match f.as_assoc_item(db)?.container(db) { AssocItemContainer::Trait(t) => Some(t.name(db)), - AssocItemContainer::ImplDef(i) => i.target_ty(db).as_adt().map(|adt| adt.name(db)), + AssocItemContainer::Impl(i) => i.target_ty(db).as_adt().map(|adt| adt.name(db)), }, ModuleDef::EnumVariant(e) => Some(e.parent_enum(db).name(db)), _ => None, diff --git a/crates/ide/src/runnables.rs b/crates/ide/src/runnables.rs index 646f63704..96462a7b0 100644 --- a/crates/ide/src/runnables.rs +++ b/crates/ide/src/runnables.rs @@ -130,7 +130,7 @@ fn runnable_fn( hir::AssocItemContainer::Trait(trait_item) => { Some(trait_item.name(sema.db).to_string()) } - hir::AssocItemContainer::ImplDef(impl_def) => impl_def + hir::AssocItemContainer::Impl(impl_def) => impl_def .target_ty(sema.db) .as_adt() .map(|adt| adt.name(sema.db).to_string()), -- cgit v1.2.3