Skip to content

Commit

Permalink
Auto merge of #17903 - tmandry:graceful-exit, r=Veykril
Browse files Browse the repository at this point in the history
Allow flycheck process to exit gracefully

Assuming it isn't cancelled. Closes #17902.

The only place CommandHandle::join() is used is when the flycheck command
finishes, so this commit changes the behavior of the method itself.

The only reason I can see for the existing behavior is if the command is somehow holding onto a build lock longer than it should, this would force it to be released. But it would be a pretty heavy-handed way to solve that issue. I'm not aware of this occurring in practice.
  • Loading branch information
bors committed Aug 16, 2024
2 parents 28b6838 + da34676 commit 4cd8dcf
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion crates/rust-analyzer/src/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ impl<T: ParseFromLine> CommandHandle<T> {
}

pub(crate) fn join(mut self) -> io::Result<()> {
let _ = self.child.0.kill();
let exit_status = self.child.0.wait()?;
let (read_at_least_one_message, error) = self.thread.join()?;
if read_at_least_one_message || exit_status.success() {
Expand Down

0 comments on commit 4cd8dcf

Please sign in to comment.