Cole Miller
a873cf402c
This removes gpui's dependency on the `util` crate, which depends on async process. It now depends on `gpui_util` only, and uses `std::process::Command` for the two cases where it was previously using an async `Command`. This lifts the requirement of non-Zed consumers of gpui to depend on our forked async-process (see #59156). Release Notes: - N/A
129 lines
3.0 KiB
Rust
129 lines
3.0 KiB
Rust
use std::ffi::OsStr;
|
|
#[cfg(not(target_os = "macos"))]
|
|
use std::path::Path;
|
|
|
|
#[cfg(target_os = "macos")]
|
|
mod darwin;
|
|
|
|
#[cfg(target_os = "macos")]
|
|
pub use darwin::{Child, Command, Stdio};
|
|
|
|
#[cfg(target_os = "windows")]
|
|
const CREATE_NO_WINDOW: u32 = 0x0800_0000_u32;
|
|
|
|
pub use gpui_util::new_std_command;
|
|
|
|
pub fn new_command(program: impl AsRef<OsStr>) -> Command {
|
|
Command::new(program)
|
|
}
|
|
|
|
#[cfg(not(target_os = "macos"))]
|
|
pub type Child = smol::process::Child;
|
|
|
|
#[cfg(not(target_os = "macos"))]
|
|
pub use std::process::Stdio;
|
|
|
|
#[cfg(not(target_os = "macos"))]
|
|
#[derive(Debug)]
|
|
pub struct Command(smol::process::Command);
|
|
|
|
#[cfg(not(target_os = "macos"))]
|
|
impl Command {
|
|
#[inline]
|
|
pub fn new(program: impl AsRef<OsStr>) -> Self {
|
|
#[cfg(target_os = "windows")]
|
|
{
|
|
use smol::process::windows::CommandExt;
|
|
let mut cmd = smol::process::Command::new(program);
|
|
cmd.creation_flags(CREATE_NO_WINDOW);
|
|
Self(cmd)
|
|
}
|
|
#[cfg(not(target_os = "windows"))]
|
|
Self(smol::process::Command::new(program))
|
|
}
|
|
|
|
pub fn arg(&mut self, arg: impl AsRef<OsStr>) -> &mut Self {
|
|
self.0.arg(arg);
|
|
self
|
|
}
|
|
|
|
pub fn args<I, S>(&mut self, args: I) -> &mut Self
|
|
where
|
|
I: IntoIterator<Item = S>,
|
|
S: AsRef<OsStr>,
|
|
{
|
|
self.0.args(args);
|
|
self
|
|
}
|
|
|
|
pub fn get_args(&self) -> impl Iterator<Item = &OsStr> {
|
|
self.0.get_args()
|
|
}
|
|
|
|
pub fn env(&mut self, key: impl AsRef<OsStr>, val: impl AsRef<OsStr>) -> &mut Self {
|
|
self.0.env(key, val);
|
|
self
|
|
}
|
|
|
|
pub fn envs<I, K, V>(&mut self, vars: I) -> &mut Self
|
|
where
|
|
I: IntoIterator<Item = (K, V)>,
|
|
K: AsRef<OsStr>,
|
|
V: AsRef<OsStr>,
|
|
{
|
|
self.0.envs(vars);
|
|
self
|
|
}
|
|
|
|
pub fn env_remove(&mut self, key: impl AsRef<OsStr>) -> &mut Self {
|
|
self.0.env_remove(key);
|
|
self
|
|
}
|
|
|
|
pub fn env_clear(&mut self) -> &mut Self {
|
|
self.0.env_clear();
|
|
self
|
|
}
|
|
|
|
pub fn current_dir(&mut self, dir: impl AsRef<Path>) -> &mut Self {
|
|
self.0.current_dir(dir);
|
|
self
|
|
}
|
|
|
|
pub fn stdin(&mut self, cfg: impl Into<Stdio>) -> &mut Self {
|
|
self.0.stdin(cfg.into());
|
|
self
|
|
}
|
|
|
|
pub fn stdout(&mut self, cfg: impl Into<Stdio>) -> &mut Self {
|
|
self.0.stdout(cfg.into());
|
|
self
|
|
}
|
|
|
|
pub fn stderr(&mut self, cfg: impl Into<Stdio>) -> &mut Self {
|
|
self.0.stderr(cfg.into());
|
|
self
|
|
}
|
|
|
|
pub fn kill_on_drop(&mut self, kill_on_drop: bool) -> &mut Self {
|
|
self.0.kill_on_drop(kill_on_drop);
|
|
self
|
|
}
|
|
|
|
pub fn spawn(&mut self) -> std::io::Result<Child> {
|
|
self.0.spawn()
|
|
}
|
|
|
|
pub async fn output(&mut self) -> std::io::Result<std::process::Output> {
|
|
self.0.output().await
|
|
}
|
|
|
|
pub async fn status(&mut self) -> std::io::Result<std::process::ExitStatus> {
|
|
self.0.status().await
|
|
}
|
|
|
|
pub fn get_program(&self) -> &OsStr {
|
|
self.0.get_program()
|
|
}
|
|
}
|