diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-02-29 20:40:29 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-02-29 20:40:29 +0000 |
commit | 5e78036e6c8752fda350818afdd411ab25f405ce (patch) | |
tree | e099bb9e9c04392dcb7fed54200a989f663f3659 /crates/ra_hir_def/src/lang_item.rs | |
parent | e91320632a9dfee937c3c2ba3ffafd3f5ffb22dc (diff) | |
parent | a1e18695548b5cd6661f26a985b34c8b105e1896 (diff) |
Merge #3379
3379: Rename ast::ImplBlock -> ast::ImplDef r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir_def/src/lang_item.rs')
-rw-r--r-- | crates/ra_hir_def/src/lang_item.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crates/ra_hir_def/src/lang_item.rs b/crates/ra_hir_def/src/lang_item.rs index 37c861a87..5a336ea1f 100644 --- a/crates/ra_hir_def/src/lang_item.rs +++ b/crates/ra_hir_def/src/lang_item.rs | |||
@@ -16,7 +16,7 @@ use crate::{ | |||
16 | pub enum LangItemTarget { | 16 | pub enum LangItemTarget { |
17 | EnumId(EnumId), | 17 | EnumId(EnumId), |
18 | FunctionId(FunctionId), | 18 | FunctionId(FunctionId), |
19 | ImplBlockId(ImplId), | 19 | ImplDefId(ImplId), |
20 | StaticId(StaticId), | 20 | StaticId(StaticId), |
21 | StructId(StructId), | 21 | StructId(StructId), |
22 | TraitId(TraitId), | 22 | TraitId(TraitId), |
@@ -37,9 +37,9 @@ impl LangItemTarget { | |||
37 | } | 37 | } |
38 | } | 38 | } |
39 | 39 | ||
40 | pub fn as_impl_block(self) -> Option<ImplId> { | 40 | pub fn as_impl_def(self) -> Option<ImplId> { |
41 | match self { | 41 | match self { |
42 | LangItemTarget::ImplBlockId(id) => Some(id), | 42 | LangItemTarget::ImplDefId(id) => Some(id), |
43 | _ => None, | 43 | _ => None, |
44 | } | 44 | } |
45 | } | 45 | } |
@@ -125,8 +125,8 @@ impl LangItems { | |||
125 | // Look for impl targets | 125 | // Look for impl targets |
126 | let def_map = db.crate_def_map(module.krate); | 126 | let def_map = db.crate_def_map(module.krate); |
127 | let module_data = &def_map[module.local_id]; | 127 | let module_data = &def_map[module.local_id]; |
128 | for impl_block in module_data.scope.impls() { | 128 | for impl_def in module_data.scope.impls() { |
129 | self.collect_lang_item(db, impl_block, LangItemTarget::ImplBlockId) | 129 | self.collect_lang_item(db, impl_def, LangItemTarget::ImplDefId) |
130 | } | 130 | } |
131 | 131 | ||
132 | for def in module_data.scope.declarations() { | 132 | for def in module_data.scope.declarations() { |