diff --git a/crates/util/src/util.rs b/crates/util/src/util.rs index 3886e527a5..fe5e77c0aa 100644 --- a/crates/util/src/util.rs +++ b/crates/util/src/util.rs @@ -6,7 +6,7 @@ pub mod serde; #[cfg(any(test, feature = "test-support"))] pub mod test; -use anyhow::{anyhow, Context as _, Result}; +use anyhow::Result; use futures::Future; use itertools::Either; use regex::Regex; @@ -23,6 +23,9 @@ use std::{ }; use unicase::UniCase; +#[cfg(unix)] +use anyhow::{anyhow, Context as _}; + pub use take_until::*; #[macro_export] @@ -195,6 +198,7 @@ pub fn load_shell_from_passwd() -> Result<()> { Ok(()) } +#[cfg(unix)] pub fn load_login_shell_environment() -> Result<()> { let marker = "ZED_LOGIN_SHELL_START"; let shell = env::var("SHELL").context( diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs index b010e836d5..cc4e98f38c 100644 --- a/crates/zed/src/main.rs +++ b/crates/zed/src/main.rs @@ -48,7 +48,7 @@ use std::{ }; use theme::{ActiveTheme, SystemAppearance, ThemeRegistry, ThemeSettings}; use time::UtcOffset; -use util::{load_login_shell_environment, maybe, ResultExt, TryFutureExt}; +use util::{maybe, ResultExt, TryFutureExt}; use uuid::Uuid; use welcome::{show_welcome_view, BaseKeymap, FIRST_OPEN}; use workspace::{ @@ -64,7 +64,7 @@ use zed::{ use crate::zed::inline_completion_registry; #[cfg(unix)] -use util::load_shell_from_passwd; +use util::{load_login_shell_environment, load_shell_from_passwd}; #[cfg(feature = "mimalloc")] #[global_allocator] @@ -255,13 +255,11 @@ fn main() { paths::keymap_file().clone(), ); + #[cfg(unix)] if !stdout_is_a_pty() { app.background_executor() .spawn(async { - #[cfg(unix)] - { - load_shell_from_passwd().log_err(); - } + load_shell_from_passwd().log_err(); load_login_shell_environment().log_err(); }) .detach()