mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #2058

Browse Source 
2058: add --with-deps option to analysis-stats r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2019-10-24 09:32:47 +00:00 committed by GitHub
commit 29a31a6639
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crates/ra_cli/src/analysis_stats.rs
View File

@ -13,6 +13,7 @@ pub fn run(
memory_usage: bool,
path: &Path,
only: Option<&str>,
with_deps: bool,
) -> Result<()> {
let db_load_time = Instant::now();
let (mut host, roots) = ra_batch::load_cargo(path)?;
@ -23,18 +24,17 @@ pub fn run(
let mut visited_modules = HashSet::new();
let mut visit_queue = Vec::new();
let members = roots
.into_iter()
.filter_map(
|(source_root_id, project_root)| {
if project_root.is_member() {
let members =
roots
.into_iter()
.filter_map(|(source_root_id, project_root)| {
if with_deps || project_root.is_member() {
Some(source_root_id)
} else {
None
}
},
)
.collect::<HashSet<_>>();
})
.collect::<HashSet<_>>();
for krate in Crate::all(db) {
let module = krate.root_module(db).expect("crate without root module");

2
crates/ra_cli/src/main.rs
View File

@ -96,6 +96,7 @@ fn main() -> Result<()> {
};
let memory_usage = matches.contains("--memory-usage");
let only: Option<String> = matches.opt_value_from_str(["-o", "--only"])?;
let with_deps: bool = matches.contains("--with-deps");
let path = {
let mut trailing = matches.free()?;
if trailing.len() != 1 {
@ -109,6 +110,7 @@ fn main() -> Result<()> {
memory_usage,
path.as_ref(),
only.as_ref().map(String::as_ref),
with_deps,
)?;
}
"analysis-bench" => {