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

Merge pull request #20170 from Veykril/push-vtsmzopsunsw

Browse Source 
Improve flycheck and build script progress reporting
This commit is contained in:
Laurențiu Nicola 2025-07-04 13:46:09 +00:00 committed by GitHub
commit 3816d0ae53
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/project-model/src/build_dependencies.rs
View File

@ -312,7 +312,9 @@ impl WorkspaceBuildScripts {
match message { match message {
Message::BuildScriptExecuted(mut message) => { Message::BuildScriptExecuted(mut message) => {
with_output_for(&message.package_id.repr, &mut |name, data| { with_output_for(&message.package_id.repr, &mut |name, data| {
progress(format!("running build-script: {name}")); progress(format!(
"building compile-time-deps: build script {name} run"
));
let cfgs = { let cfgs = {
let mut acc = Vec::new(); let mut acc = Vec::new();
for cfg in &message.cfgs { for cfg in &message.cfgs {
@ -343,7 +345,9 @@ impl WorkspaceBuildScripts {
} }
Message::CompilerArtifact(message) => { Message::CompilerArtifact(message) => {
with_output_for(&message.package_id.repr, &mut |name, data| { with_output_for(&message.package_id.repr, &mut |name, data| {
progress(format!("building proc-macros: {name}")); progress(format!(
"building compile-time-deps: proc-macro {name} built"
));
if message.target.kind.contains(&cargo_metadata::TargetKind::ProcMacro) if message.target.kind.contains(&cargo_metadata::TargetKind::ProcMacro)
{ {
// Skip rmeta file // Skip rmeta file

7
crates/rust-analyzer/src/flycheck.rs
View File

@ -6,6 +6,7 @@ use std::{fmt, io, process::Command, time::Duration};
use cargo_metadata::PackageId; use cargo_metadata::PackageId;
use crossbeam_channel::{Receiver, Sender, select_biased, unbounded}; use crossbeam_channel::{Receiver, Sender, select_biased, unbounded};
use ide_db::FxHashSet; use ide_db::FxHashSet;
use itertools::Itertools;
use paths::{AbsPath, AbsPathBuf, Utf8PathBuf}; use paths::{AbsPath, AbsPathBuf, Utf8PathBuf};
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
use serde::Deserialize as _; use serde::Deserialize as _;
@ -379,7 +380,11 @@ impl FlycheckActor {
package_id = msg.package_id.repr, package_id = msg.package_id.repr,
"artifact received" "artifact received"
); );
self.report_progress(Progress::DidCheckCrate(msg.target.name)); self.report_progress(Progress::DidCheckCrate(format!(
"{} ({})",
msg.target.name,
msg.target.kind.iter().format_with(", ", |kind, f| f(&kind)),
)));
let package_id = Arc::new(msg.package_id); let package_id = Arc::new(msg.package_id);
if self.diagnostics_cleared_for.insert(package_id.clone()) { if self.diagnostics_cleared_for.insert(package_id.clone()) {
tracing::trace!( tracing::trace!(