From 64df759418a83fd05fab850b8351fcddbdd3ef63 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 22 Nov 2019 17:33:53 +0300 Subject: Make ImplData's fields public --- crates/ra_hir/src/impl_block.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'crates/ra_hir/src/impl_block.rs') diff --git a/crates/ra_hir/src/impl_block.rs b/crates/ra_hir/src/impl_block.rs index 774fa1d96..334eeebac 100644 --- a/crates/ra_hir/src/impl_block.rs +++ b/crates/ra_hir/src/impl_block.rs @@ -18,11 +18,11 @@ impl HasSource for ImplBlock { impl ImplBlock { pub fn target_trait(&self, db: &impl DefDatabase) -> Option { - db.impl_data(self.id).target_trait().cloned() + db.impl_data(self.id).target_trait.clone() } pub fn target_type(&self, db: &impl DefDatabase) -> TypeRef { - db.impl_data(self.id).target_type().clone() + db.impl_data(self.id).target_type.clone() } pub fn target_ty(&self, db: &impl HirDatabase) -> Ty { @@ -35,11 +35,11 @@ impl ImplBlock { } pub fn items(&self, db: &impl DefDatabase) -> Vec { - db.impl_data(self.id).items().iter().map(|it| (*it).into()).collect() + db.impl_data(self.id).items.iter().map(|it| (*it).into()).collect() } pub fn is_negative(&self, db: &impl DefDatabase) -> bool { - db.impl_data(self.id).is_negative() + db.impl_data(self.id).is_negative } pub fn module(&self, db: &impl DefDatabase) -> Module { -- cgit v1.2.3 From 191b1d238fd1594ab74b1ab6a17dbe0430fc6b1a Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sun, 24 Nov 2019 21:03:24 +0300 Subject: Remove impl_block module --- crates/ra_hir/src/impl_block.rs | 52 ----------------------------------------- 1 file changed, 52 deletions(-) delete mode 100644 crates/ra_hir/src/impl_block.rs (limited to 'crates/ra_hir/src/impl_block.rs') diff --git a/crates/ra_hir/src/impl_block.rs b/crates/ra_hir/src/impl_block.rs deleted file mode 100644 index 334eeebac..000000000 --- a/crates/ra_hir/src/impl_block.rs +++ /dev/null @@ -1,52 +0,0 @@ -//! FIXME: write short doc here - -use hir_def::{resolver::HasResolver, type_ref::TypeRef, AstItemDef}; -use ra_syntax::ast; - -use crate::{ - db::{AstDatabase, DefDatabase, HirDatabase}, - ty::Ty, - AssocItem, Crate, HasSource, ImplBlock, Module, Source, TraitRef, -}; - -impl HasSource for ImplBlock { - type Ast = ast::ImplBlock; - fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source { - self.id.source(db) - } -} - -impl ImplBlock { - pub fn target_trait(&self, db: &impl DefDatabase) -> Option { - db.impl_data(self.id).target_trait.clone() - } - - pub fn target_type(&self, db: &impl DefDatabase) -> TypeRef { - db.impl_data(self.id).target_type.clone() - } - - pub fn target_ty(&self, db: &impl HirDatabase) -> Ty { - Ty::from_hir(db, &self.id.resolver(db), &self.target_type(db)) - } - - pub fn target_trait_ref(&self, db: &impl HirDatabase) -> Option { - let target_ty = self.target_ty(db); - TraitRef::from_hir(db, &self.id.resolver(db), &self.target_trait(db)?, Some(target_ty)) - } - - pub fn items(&self, db: &impl DefDatabase) -> Vec { - db.impl_data(self.id).items.iter().map(|it| (*it).into()).collect() - } - - pub fn is_negative(&self, db: &impl DefDatabase) -> bool { - db.impl_data(self.id).is_negative - } - - pub fn module(&self, db: &impl DefDatabase) -> Module { - self.id.module(db).into() - } - - pub fn krate(&self, db: &impl DefDatabase) -> Crate { - Crate { crate_id: self.module(db).id.krate } - } -} -- cgit v1.2.3