aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir_def/src/data.rs
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-02-29 20:40:29 +0000
committerGitHub <[email protected]>2020-02-29 20:40:29 +0000
commit5e78036e6c8752fda350818afdd411ab25f405ce (patch)
treee099bb9e9c04392dcb7fed54200a989f663f3659 /crates/ra_hir_def/src/data.rs
parente91320632a9dfee937c3c2ba3ffafd3f5ffb22dc (diff)
parenta1e18695548b5cd6661f26a985b34c8b105e1896 (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/data.rs')
-rw-r--r--crates/ra_hir_def/src/data.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir_def/src/data.rs b/crates/ra_hir_def/src/data.rs
index c900a6a18..c5fb9428e 100644
--- a/crates/ra_hir_def/src/data.rs
+++ b/crates/ra_hir_def/src/data.rs
@@ -238,16 +238,16 @@ impl ConstData {
238fn collect_impl_items_in_macros( 238fn collect_impl_items_in_macros(
239 db: &impl DefDatabase, 239 db: &impl DefDatabase,
240 module_id: ModuleId, 240 module_id: ModuleId,
241 impl_block: &InFile<ast::ItemList>, 241 impl_def: &InFile<ast::ItemList>,
242 id: ImplId, 242 id: ImplId,
243) -> Vec<AssocItemId> { 243) -> Vec<AssocItemId> {
244 let mut expander = Expander::new(db, impl_block.file_id, module_id); 244 let mut expander = Expander::new(db, impl_def.file_id, module_id);
245 let mut res = Vec::new(); 245 let mut res = Vec::new();
246 246
247 // We set a limit to protect against infinite recursion 247 // We set a limit to protect against infinite recursion
248 let limit = 100; 248 let limit = 100;
249 249
250 for m in impl_block.value.syntax().children().filter_map(ast::MacroCall::cast) { 250 for m in impl_def.value.syntax().children().filter_map(ast::MacroCall::cast) {
251 res.extend(collect_impl_items_in_macro(db, &mut expander, m, id, limit)) 251 res.extend(collect_impl_items_in_macro(db, &mut expander, m, id, limit))
252 } 252 }
253 253