Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-25 12:33:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #11284

Browse source 
11284: internal: Remove redundant recursion limit r=jonas-schievink a=jonas-schievink

`Expander` already does this, so we don't have to track the depth when collecting associated items.

bors r+

Co-authored-by: Jonas Schievink <jonas.schievink@ferrous-systems.com>
This commit is contained in:
bors[bot] 2022-01-14 16:53:26 +00:00 committed by GitHub
commit 44ffae12ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
crates/hir_def/src/data.rs
View file

@ -358,7 +358,6 @@ fn do_collect(
assoc_items.iter().copied(), assoc_items.iter().copied(),
tree_id, tree_id,
container, container,
100,
); );
let attribute_calls = let attribute_calls =
@ -375,12 +374,7 @@ fn collect_items(
assoc_items: impl Iterator<Item = AssocItem>, assoc_items: impl Iterator<Item = AssocItem>,
tree_id: item_tree::TreeId, tree_id: item_tree::TreeId,
container: ItemContainerId, container: ItemContainerId,
limit: usize,
) { ) {
if limit == 0 {
return;
}
let item_tree = tree_id.item_tree(db); let item_tree = tree_id.item_tree(db);
let crate_graph = db.crate_graph(); let crate_graph = db.crate_graph();
let cfg_options = &crate_graph[module.krate].cfg_options; let cfg_options = &crate_graph[module.krate].cfg_options;
@ -401,7 +395,7 @@ fn collect_items(
{ {
attr_calls.push((ast_id, call_id)); attr_calls.push((ast_id, call_id));
let res = expander.enter_expand_id(db, call_id); let res = expander.enter_expand_id(db, call_id);
collect_macro_items(db, items, attr_calls, module, expander, container, limit, res); collect_macro_items(db, items, attr_calls, module, expander, container, res);
continue 'items; continue 'items;
} }
} }
@ -435,9 +429,7 @@ fn collect_items(
let res = expander.enter_expand(db, call); let res = expander.enter_expand(db, call);
if let Ok(res) = res { if let Ok(res) = res {
collect_macro_items( collect_macro_items(db, items, attr_calls, module, expander, container, res);
db, items, attr_calls, module, expander, container, limit, res,
);
} }
} }
} }
@ -451,7 +443,6 @@ fn collect_macro_items(
module: ModuleId, module: ModuleId,
expander: &mut Expander, expander: &mut Expander,
container: ItemContainerId, container: ItemContainerId,
limit: usize,
res: ExpandResult<Option<(Mark, ast::MacroItems)>>, res: ExpandResult<Option<(Mark, ast::MacroItems)>>,
) { ) {
if let Some((mark, mac)) = res.value { if let Some((mark, mac)) = res.value {
@ -459,7 +450,7 @@ fn collect_macro_items(
let tree_id = item_tree::TreeId::new(src.file_id, None); let tree_id = item_tree::TreeId::new(src.file_id, None);
let item_tree = tree_id.item_tree(db); let item_tree = tree_id.item_tree(db);
let iter = item_tree.top_level_items().iter().filter_map(ModItem::as_assoc_item); let iter = item_tree.top_level_items().iter().filter_map(ModItem::as_assoc_item);
collect_items(db, items, attr_calls, module, expander, iter, tree_id, container, limit - 1); collect_items(db, items, attr_calls, module, expander, iter, tree_id, container);
expander.exit(db, mark); expander.exit(db, mark);
} }