language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-11-01 04:18:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Deduplicate sort+dedup calls

Browse source
This commit is contained in:
itsjunetime 2025-10-04 13:00:09 -05:00
parent 4b0c711918
commit 42f7666b79
No known key found for this signature in database
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
crates/rust-analyzer/src/cli/analysis_stats.rs
View file

@ -337,12 +337,15 @@ impl flags::AnalysisStats {
} }
}); });
file_ids.sort();
file_ids.dedup();
if self.run_all_ide_things { if self.run_all_ide_things {
self.run_ide_things(host.analysis(), file_ids.clone(), db, &vfs, verbosity); self.run_ide_things(host.analysis(), &file_ids, db, &vfs, verbosity);
} }
if self.run_term_search { if self.run_term_search {
self.run_term_search(&workspace, db, &vfs, file_ids, verbosity); self.run_term_search(&workspace, db, &vfs, &file_ids, verbosity);
} }
let db = host.raw_database_mut(); let db = host.raw_database_mut();
@ -438,12 +441,13 @@ impl flags::AnalysisStats {
report_metric("const eval time", const_eval_time.time.as_millis() as u64, "ms"); report_metric("const eval time", const_eval_time.time.as_millis() as u64, "ms");
} }
/// Invariant: `file_ids` must be sorted and deduped before passing into here
fn run_term_search( fn run_term_search(
&self, &self,
ws: &ProjectWorkspace, ws: &ProjectWorkspace,
db: &RootDatabase, db: &RootDatabase,
vfs: &Vfs, vfs: &Vfs,
mut file_ids: Vec<EditionedFileId>, file_ids: &[EditionedFileId],
verbosity: Verbosity, verbosity: Verbosity,
) { ) {
let cargo_config = CargoConfig { let cargo_config = CargoConfig {
@ -461,9 +465,6 @@ impl flags::AnalysisStats {
_ => ProgressReport::new(file_ids.len()), _ => ProgressReport::new(file_ids.len()),
}; };
file_ids.sort();
file_ids.dedup();
#[derive(Debug, Default)] #[derive(Debug, Default)]
struct Acc { struct Acc {
tail_expr_syntax_hits: u64, tail_expr_syntax_hits: u64,
@ -477,7 +478,7 @@ impl flags::AnalysisStats {
bar.tick(); bar.tick();
let mut sw = self.stop_watch(); let mut sw = self.stop_watch();
for &file_id in &file_ids { for &file_id in file_ids {
let file_id = file_id.editioned_file_id(db); let file_id = file_id.editioned_file_id(db);
let sema = hir::Semantics::new(db); let sema = hir::Semantics::new(db);
let display_target = match sema.first_crate(file_id.file_id()) { let display_target = match sema.first_crate(file_id.file_id()) {
@ -1109,10 +1110,11 @@ impl flags::AnalysisStats {
report_metric("body lowering time", body_lowering_time.time.as_millis() as u64, "ms"); report_metric("body lowering time", body_lowering_time.time.as_millis() as u64, "ms");
} }
/// Invariant: `file_ids` must be sorted and deduped before passing into here
fn run_ide_things( fn run_ide_things(
&self, &self,
analysis: Analysis, analysis: Analysis,
mut file_ids: Vec<EditionedFileId>, file_ids: &[EditionedFileId],
db: &RootDatabase, db: &RootDatabase,
vfs: &Vfs, vfs: &Vfs,
verbosity: Verbosity, verbosity: Verbosity,
@ -1124,12 +1126,10 @@ impl flags::AnalysisStats {
_ => ProgressReport::new(len), _ => ProgressReport::new(len),
}; };
file_ids.sort();
file_ids.dedup();
let mut sw = self.stop_watch(); let mut sw = self.stop_watch();
let mut bar = create_bar(); let mut bar = create_bar();
for &file_id in &file_ids { for &file_id in file_ids {
let msg = format!("diagnostics: {}", vfs.file_path(file_id.file_id(db))); let msg = format!("diagnostics: {}", vfs.file_path(file_id.file_id(db)));
bar.set_message(move || msg.clone()); bar.set_message(move || msg.clone());
_ = analysis.full_diagnostics( _ = analysis.full_diagnostics(
@ -1163,7 +1163,7 @@ impl flags::AnalysisStats {
bar.finish_and_clear(); bar.finish_and_clear();
let mut bar = create_bar(); let mut bar = create_bar();
for &file_id in &file_ids { for &file_id in file_ids {
let msg = format!("inlay hints: {}", vfs.file_path(file_id.file_id(db))); let msg = format!("inlay hints: {}", vfs.file_path(file_id.file_id(db)));
bar.set_message(move || msg.clone()); bar.set_message(move || msg.clone());
_ = analysis.inlay_hints( _ = analysis.inlay_hints(
@ -1206,7 +1206,7 @@ impl flags::AnalysisStats {
bar.finish_and_clear(); bar.finish_and_clear();
let mut bar = create_bar(); let mut bar = create_bar();
for &file_id in &file_ids { for &file_id in file_ids {
let msg = format!("annotations: {}", vfs.file_path(file_id.file_id(db))); let msg = format!("annotations: {}", vfs.file_path(file_id.file_id(db)));
bar.set_message(move || msg.clone()); bar.set_message(move || msg.clone());
analysis analysis