language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 04:19:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Rename ImplBlock::target -> target_type, and add target_trait already

Browse source
This commit is contained in:
Florian Diebold 2018-12-30 19:59:49 +01:00
parent bb029cd29b
commit 334ca0d9a7
2 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/ra_hir/src/impl_block.rs
View file

@ -35,8 +35,12 @@ impl ImplBlock {
&self.crate_impl_blocks.impls[self.impl_id]
}
pub fn target(&self) -> &TypeRef {
&self.impl_data().impl_for
pub fn target_trait(&self) -> Option<&TypeRef> {
self.impl_data().target_trait.as_ref()
}
pub fn target_type(&self) -> &TypeRef {
&self.impl_data().target_type
}
pub fn items(&self) -> &[ImplItem] {
@ -46,7 +50,8 @@ impl ImplBlock {
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct ImplData {
impl_for: TypeRef,
target_trait: Option<TypeRef>,
target_type: TypeRef,
items: Vec<ImplItem>,
}
@ -57,7 +62,8 @@ impl ImplData {
module: &Module,
node: ast::ImplBlock,
) -> Self {
let impl_for = TypeRef::from_ast_opt(node.target_type());
let target_trait = node.target_type().map(TypeRef::from_ast);
let target_type = TypeRef::from_ast_opt(node.target_type());
let file_id = module.source().file_id();
let items = if let Some(item_list) = node.item_list() {
item_list
@ -89,7 +95,11 @@ impl ImplData {
} else {
Vec::new()
};
ImplData { impl_for, items }
ImplData {
target_trait,
target_type,
items,
}
}
}