diff --git a/crates/askpass/src/askpass.rs b/crates/askpass/src/askpass.rs index 5a07792e88..03b4be8bd1 100644 --- a/crates/askpass/src/askpass.rs +++ b/crates/askpass/src/askpass.rs @@ -163,8 +163,10 @@ impl AskPassSession { #[cfg(unix)] fn get_shell_safe_zed_path() -> anyhow::Result { let zed_path = std::env::current_exe() - .context("Failed to figure out current executable path for use in askpass")? + .context("Failed to determine current executable path for use in askpass")? .to_string_lossy() + // see https://github.com/rust-lang/rust/issues/69343 + .trim_end_matches(" (deleted)") .to_string(); // NOTE: this was previously enabled, however, it caused errors when it shouldn't have diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs index 167e232f0b..8fb3c0bf96 100644 --- a/crates/gpui/src/platform/linux/platform.rs +++ b/crates/gpui/src/platform/linux/platform.rs @@ -426,8 +426,8 @@ impl Platform for P { fn app_path(&self) -> Result { // get the path of the executable of the current process - let exe_path = env::current_exe()?; - Ok(exe_path) + let app_path = env::current_exe()?; + return Ok(app_path); } fn set_menus(&self, menus: Vec, _keymap: &Keymap) {