mikros/rust
1
0
Fork 0
Code Issues Pull Requests 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

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

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