mirror of
https://github.com/rust-lang/rust-analyzer
synced 2024-12-26 13:03:31 +00:00
Avoid intermediate collections
This commit is contained in:
parent
724059569b
commit
74f8201586
2 changed files with 53 additions and 27 deletions
|
@ -101,24 +101,22 @@ pub(crate) fn runnables(db: &RootDatabase, file_id: FileId) -> Vec<Runnable> {
|
||||||
Some(it) => it,
|
Some(it) => it,
|
||||||
};
|
};
|
||||||
|
|
||||||
runnables_mod(&sema, module)
|
let mut res = Vec::new();
|
||||||
|
runnables_mod(&sema, &mut res, module);
|
||||||
|
res
|
||||||
}
|
}
|
||||||
|
|
||||||
fn runnables_mod(sema: &Semantics<RootDatabase>, module: hir::Module) -> Vec<Runnable> {
|
fn runnables_mod(sema: &Semantics<RootDatabase>, acc: &mut Vec<Runnable>, module: hir::Module) {
|
||||||
let mut res: Vec<Runnable> = module
|
acc.extend(module.declarations(sema.db).into_iter().filter_map(|def| {
|
||||||
.declarations(sema.db)
|
let runnable = match def {
|
||||||
.into_iter()
|
hir::ModuleDef::Module(it) => runnable_mod(&sema, it),
|
||||||
.filter_map(|def| {
|
hir::ModuleDef::Function(it) => runnable_fn(&sema, it),
|
||||||
let runnable = match def {
|
_ => None,
|
||||||
hir::ModuleDef::Module(it) => runnable_mod(&sema, it),
|
};
|
||||||
hir::ModuleDef::Function(it) => runnable_fn(&sema, it),
|
runnable.or_else(|| module_def_doctest(&sema, def))
|
||||||
_ => None,
|
}));
|
||||||
};
|
|
||||||
runnable.or_else(|| module_def_doctest(&sema, def))
|
|
||||||
})
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
res.extend(module.impl_defs(sema.db).into_iter().flat_map(|it| it.items(sema.db)).filter_map(
|
acc.extend(module.impl_defs(sema.db).into_iter().flat_map(|it| it.items(sema.db)).filter_map(
|
||||||
|def| match def {
|
|def| match def {
|
||||||
hir::AssocItem::Function(it) => {
|
hir::AssocItem::Function(it) => {
|
||||||
runnable_fn(&sema, it).or_else(|| module_def_doctest(&sema, it.into()))
|
runnable_fn(&sema, it).or_else(|| module_def_doctest(&sema, it.into()))
|
||||||
|
@ -128,18 +126,14 @@ fn runnables_mod(sema: &Semantics<RootDatabase>, module: hir::Module) -> Vec<Run
|
||||||
},
|
},
|
||||||
));
|
));
|
||||||
|
|
||||||
res.extend(module.declarations(sema.db).into_iter().flat_map(|def| match def {
|
for def in module.declarations(sema.db) {
|
||||||
hir::ModuleDef::Module(submodule) => match submodule.definition_source(sema.db).value {
|
if let hir::ModuleDef::Module(submodule) = def {
|
||||||
hir::ModuleSource::SourceFile(_) => {
|
match submodule.definition_source(sema.db).value {
|
||||||
mark::hit!(dont_recurse_in_outline_submodules);
|
hir::ModuleSource::Module(_) => runnables_mod(sema, acc, submodule),
|
||||||
Vec::new()
|
hir::ModuleSource::SourceFile(_) => mark::hit!(dont_recurse_in_outline_submodules),
|
||||||
}
|
}
|
||||||
hir::ModuleSource::Module(_) => runnables_mod(sema, submodule),
|
}
|
||||||
},
|
}
|
||||||
_ => Vec::new(),
|
|
||||||
}));
|
|
||||||
|
|
||||||
res
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn runnable_fn(sema: &Semantics<RootDatabase>, def: hir::Function) -> Option<Runnable> {
|
pub(crate) fn runnable_fn(sema: &Semantics<RootDatabase>, def: hir::Function) -> Option<Runnable> {
|
||||||
|
|
|
@ -421,12 +421,44 @@ fn frobnicate(s: &str) {
|
||||||
**Rationale:** reveals the costs.
|
**Rationale:** reveals the costs.
|
||||||
It is also more efficient when the caller already owns the allocation.
|
It is also more efficient when the caller already owns the allocation.
|
||||||
|
|
||||||
## Collection types
|
## Collection Types
|
||||||
|
|
||||||
Prefer `rustc_hash::FxHashMap` and `rustc_hash::FxHashSet` instead of the ones in `std::collections`.
|
Prefer `rustc_hash::FxHashMap` and `rustc_hash::FxHashSet` instead of the ones in `std::collections`.
|
||||||
|
|
||||||
**Rationale:** they use a hasher that's significantly faster and using them consistently will reduce code size by some small amount.
|
**Rationale:** they use a hasher that's significantly faster and using them consistently will reduce code size by some small amount.
|
||||||
|
|
||||||
|
## Avoid Intermediate Collections
|
||||||
|
|
||||||
|
When writing a recursive function to compute a sets of things, use an accumulator parameter instead of returning a fresh collection.
|
||||||
|
Accumulator goes first in the list of arguments.
|
||||||
|
|
||||||
|
```rust
|
||||||
|
// GOOD
|
||||||
|
pub fn reachable_nodes(node: Node) -> FxHashSet<Node> {
|
||||||
|
let mut res = FxHashSet::default();
|
||||||
|
go(&mut res, node);
|
||||||
|
res
|
||||||
|
}
|
||||||
|
fn go(acc: &mut FxHashSet<Node>, node: Node) {
|
||||||
|
acc.insert(node);
|
||||||
|
for n in node.neighbors() {
|
||||||
|
go(acc, n);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// BAD
|
||||||
|
pub fn reachable_nodes(node: Node) -> FxHashSet<Node> {
|
||||||
|
let mut res = FxHashSet::default();
|
||||||
|
res.insert(node);
|
||||||
|
for n in node.neighbors() {
|
||||||
|
res.extend(reachable_nodes(n));
|
||||||
|
}
|
||||||
|
res
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Rational:** re-use allocations, accumulator style is more concise for complex cases.
|
||||||
|
|
||||||
# Style
|
# Style
|
||||||
|
|
||||||
## Order of Imports
|
## Order of Imports
|
||||||
|
|
Loading…
Reference in a new issue