Skip to content

Commit fdd5294

Browse files
committed
Auto merge of rust-lang#17903 - tmandry:graceful-exit, r=Veykril
Allow flycheck process to exit gracefully Assuming it isn't cancelled. Closes rust-lang#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.
2 parents 95f5e4b + 23c8dcd commit fdd5294

File tree

1 file changed

+0
-1
lines changed
  • src/tools/rust-analyzer/crates/rust-analyzer/src

1 file changed

+0
-1
lines changed

src/tools/rust-analyzer/crates/rust-analyzer/src/command.rs

-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ impl<T: ParseFromLine> CommandHandle<T> {
148148
}
149149

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

0 commit comments

Comments
 (0)