vndangkhoa/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2026-06-01 03:14:56 +07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

repl: Switch to util::process::Child to rely on process groups (#48839)

Browse source 
Follow up to https://github.com/zed-industries/zed/pull/48760 thanks to
@miguelraz and @reflectronic.

No new notes since #48760 did the same thing, only wasn't opting in to
process groups we already had in place.

Release Notes:

- N/A
This commit is contained in:
Kyle Kelley 2026-03-06 09:04:23 -08:00 committed by GitHub
parent a3d9269567
commit 21e202ef0c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
crates/repl/src/kernels/native_kernel.rs
View file

@ -19,7 +19,7 @@ use std::{
path::PathBuf,
sync::Arc,
};
use util::command::Command;
use uuid::Uuid;
use super::{KernelSession, RunningKernel, start_kernel_tasks};
@ -41,7 +41,7 @@ impl Eq for LocalKernelSpecification {}
impl LocalKernelSpecification {
#[must_use]
fn command(&self, connection_path: &PathBuf) -> Result<Command> {
fn command(&self, connection_path: &PathBuf) -> Result<std::process::Command> {
let argv = &self.kernelspec.argv;
anyhow::ensure!(!argv.is_empty(), "Empty argv in kernelspec {}", self.name);
@ -52,7 +52,7 @@ impl LocalKernelSpecification {
self.name
);
let mut cmd = util::command::new_command(&argv[0]);
let mut cmd = util::command::new_std_command(&argv[0]);
for arg in &argv[1..] {
if arg == "{connection_file}" {
@ -91,7 +91,7 @@ async fn peek_ports(ip: IpAddr) -> Result<[u16; 5]> {
}
pub struct NativeRunningKernel {
pub process: util::command::Child,
pub process: util::process::Child,
connection_path: PathBuf,
_process_status_task: Option<Task<()>>,
pub working_directory: PathBuf,
@ -104,7 +104,7 @@ pub struct NativeRunningKernel {
impl Debug for NativeRunningKernel {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.debug_struct("RunningKernel")
.field("process", &self.process)
.field("process", &*self.process)
.finish()
}
}
@ -146,15 +146,14 @@ impl NativeRunningKernel {
fs.atomic_write(connection_path.clone(), content).await?;
let mut cmd = kernel_specification.command(&connection_path)?;
cmd.current_dir(&working_directory);
let mut process = cmd
.current_dir(&working_directory)
.stdout(util::command::Stdio::piped())
.stderr(util::command::Stdio::piped())
.stdin(util::command::Stdio::piped())
.kill_on_drop(true)
.spawn()
.context("failed to start the kernel process")?;
let mut process = util::process::Child::spawn(
cmd,
std::process::Stdio::piped(),
std::process::Stdio::piped(),
std::process::Stdio::piped(),
)?;
let session_id = Uuid::new_v4().to_string();