itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-04 11:34:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #8011

Browse Source 
8011: Add no-sysroot flag for analysis-stats r=edwin0cheng a=edwin0cheng

Add `no-sysroot` flag for `rust-analyzer analysis-stats`. It is very useful for debugging propose. 

bors r+

Co-authored-by: Edwin Cheng <edwin0cheng@gmail.com>
This commit is contained in:
bors[bot] 2021-03-14 10:50:59 +00:00 committed by GitHub
commit a8a7fa8347
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/rust-analyzer/src/bin/flags.rs
View File

@ -65,6 +65,8 @@ xflags::xflags! {
optional -o, --only path: String optional -o, --only path: String
/// Also analyze all dependencies. /// Also analyze all dependencies.
optional --with-deps optional --with-deps
/// Don't load sysroot crates (`std`, `core` & friends).
optional --no-sysroot
/// Load OUT_DIR values by running `cargo check` before analysis. /// Load OUT_DIR values by running `cargo check` before analysis.
optional --load-output-dirs optional --load-output-dirs
@ -176,6 +178,7 @@ pub struct AnalysisStats {
pub memory_usage: bool, pub memory_usage: bool,
pub only: Option<String>, pub only: Option<String>,
pub with_deps: bool, pub with_deps: bool,
pub no_sysroot: bool,
pub load_output_dirs: bool, pub load_output_dirs: bool,
pub with_proc_macro: bool, pub with_proc_macro: bool,
} }

1
crates/rust-analyzer/src/bin/main.rs
View File

@ -74,6 +74,7 @@ fn try_main() -> Result<()> {
memory_usage: cmd.memory_usage, memory_usage: cmd.memory_usage,
only: cmd.only, only: cmd.only,
with_deps: cmd.with_deps, with_deps: cmd.with_deps,
no_sysroot: cmd.no_sysroot,
path: cmd.path, path: cmd.path,
load_output_dirs: cmd.load_output_dirs, load_output_dirs: cmd.load_output_dirs,
with_proc_macro: cmd.with_proc_macro, with_proc_macro: cmd.with_proc_macro,

5
crates/rust-analyzer/src/cli/analysis_stats.rs
View File

@ -19,6 +19,7 @@ use ide_db::base_db::{
}; };
use itertools::Itertools; use itertools::Itertools;
use oorandom::Rand32; use oorandom::Rand32;
use project_model::CargoConfig;
use rayon::prelude::*; use rayon::prelude::*;
use rustc_hash::FxHashSet; use rustc_hash::FxHashSet;
use stdx::format_to; use stdx::format_to;
@ -46,6 +47,7 @@ pub struct AnalysisStatsCmd {
pub memory_usage: bool, pub memory_usage: bool,
pub only: Option<String>, pub only: Option<String>,
pub with_deps: bool, pub with_deps: bool,
pub no_sysroot: bool,
pub path: PathBuf, pub path: PathBuf,
pub load_output_dirs: bool, pub load_output_dirs: bool,
pub with_proc_macro: bool, pub with_proc_macro: bool,
@ -59,7 +61,8 @@ impl AnalysisStatsCmd {
}; };
let mut db_load_sw = self.stop_watch(); let mut db_load_sw = self.stop_watch();
let cargo_config = Default::default(); let mut cargo_config = CargoConfig::default();
cargo_config.no_sysroot = self.no_sysroot;
let load_cargo_config = LoadCargoConfig { let load_cargo_config = LoadCargoConfig {
load_out_dirs_from_check: self.load_output_dirs, load_out_dirs_from_check: self.load_output_dirs,
with_proc_macro: self.with_proc_macro, with_proc_macro: self.with_proc_macro,