nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-04 04:39:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #12660 - Veykril:flycheck, r=Veykril

Browse Source 
fix: Fix flycheck sending cancel progress with no running process

Fixes #12659
This commit is contained in:
bors 2022-07-01 08:11:51 +00:00
commit 7d0e5aea90
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/flycheck/src/lib.rs
View File

@ -157,12 +157,9 @@ impl FlycheckActor {
while let Some(event) = self.next_event(&inbox) { while let Some(event) = self.next_event(&inbox) {
match event { match event {
Event::Restart(Restart) => { Event::Restart(Restart) => {
if let Some(cargo_handle) = self.cargo_handle.take() {
// Cancel the previously spawned process // Cancel the previously spawned process
cargo_handle.cancel(); self.cancel_check_process();
}
while let Ok(Restart) = inbox.recv_timeout(Duration::from_millis(50)) {} while let Ok(Restart) = inbox.recv_timeout(Duration::from_millis(50)) {}
self.progress(Progress::DidCancel);
let command = self.check_command(); let command = self.check_command();
tracing::debug!(?command, "will restart flycheck"); tracing::debug!(?command, "will restart flycheck");
@ -221,6 +218,7 @@ impl FlycheckActor {
self.progress(Progress::DidCancel); self.progress(Progress::DidCancel);
} }
} }
fn check_command(&self) -> Command { fn check_command(&self) -> Command {
let mut cmd = match &self.config { let mut cmd = match &self.config {
FlycheckConfig::CargoCommand { FlycheckConfig::CargoCommand {