summaryrefslogtreecommitdiff
path: root/editors/zed/files
diff options
context:
space:
mode:
Diffstat (limited to 'editors/zed/files')
-rw-r--r--editors/zed/files/patch-Cargo.lock16
-rw-r--r--editors/zed/files/patch-crates_fs_src_fs.rs8
-rw-r--r--editors/zed/files/patch-crates_project_src_agent__server__store.rs6
-rw-r--r--editors/zed/files/patch-crates_remote__server_src_unix.rs6
-rw-r--r--editors/zed/files/patch-crates_remote_src_transport_ssh.rs40
-rw-r--r--editors/zed/files/patch-crates_zed_src_main.rs12
6 files changed, 44 insertions, 44 deletions
diff --git a/editors/zed/files/patch-Cargo.lock b/editors/zed/files/patch-Cargo.lock
index 31200c6963fe..1752a65915d6 100644
--- a/editors/zed/files/patch-Cargo.lock
+++ b/editors/zed/files/patch-Cargo.lock
@@ -1,6 +1,6 @@
---- Cargo.lock.orig 2025-12-03 16:43:47 UTC
+--- Cargo.lock.orig 2025-12-11 21:24:05 UTC
+++ Cargo.lock
-@@ -8374,21 +8374,20 @@ name = "ipc-channel"
+@@ -8382,21 +8382,20 @@ name = "ipc-channel"
[[package]]
name = "ipc-channel"
@@ -26,7 +26,7 @@
]
[[package]]
-@@ -19846,16 +19845,6 @@ name = "windows"
+@@ -19858,16 +19857,6 @@ name = "windows"
[[package]]
name = "windows"
@@ -43,7 +43,7 @@
version = "0.61.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
-@@ -19914,19 +19903,6 @@ name = "windows-core"
+@@ -19926,19 +19915,6 @@ name = "windows-core"
[[package]]
name = "windows-core"
@@ -63,7 +63,7 @@
version = "0.61.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
-@@ -19975,17 +19951,6 @@ name = "windows-implement"
+@@ -19987,17 +19963,6 @@ name = "windows-implement"
[[package]]
name = "windows-implement"
@@ -81,7 +81,7 @@
version = "0.60.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
-@@ -20008,17 +19973,6 @@ name = "windows-interface"
+@@ -20020,17 +19985,6 @@ name = "windows-interface"
[[package]]
name = "windows-interface"
@@ -99,7 +99,7 @@
version = "0.59.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
-@@ -20094,15 +20048,6 @@ name = "windows-result"
+@@ -20106,15 +20060,6 @@ name = "windows-result"
[[package]]
name = "windows-result"
@@ -115,7 +115,7 @@
version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
-@@ -20117,16 +20062,6 @@ dependencies = [
+@@ -20129,16 +20074,6 @@ dependencies = [
checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
dependencies = [
"windows-link 0.2.1",
diff --git a/editors/zed/files/patch-crates_fs_src_fs.rs b/editors/zed/files/patch-crates_fs_src_fs.rs
index d1f3e4c6670b..1a8d5b39261b 100644
--- a/editors/zed/files/patch-crates_fs_src_fs.rs
+++ b/editors/zed/files/patch-crates_fs_src_fs.rs
@@ -1,6 +1,6 @@
---- crates/fs/src/fs.rs.orig 2025-12-03 16:43:47 UTC
+--- crates/fs/src/fs.rs.orig 2025-12-11 21:24:05 UTC
+++ crates/fs/src/fs.rs
-@@ -358,7 +358,7 @@ impl FileHandle for std::fs::File {
+@@ -360,7 +360,7 @@ impl FileHandle for std::fs::File {
Ok(new_path)
}
@@ -9,7 +9,7 @@
fn current_path(&self, _: &Arc<dyn Fs>) -> Result<PathBuf> {
use std::{
ffi::{CStr, OsStr},
-@@ -367,7 +367,10 @@ impl FileHandle for std::fs::File {
+@@ -369,7 +369,10 @@ impl FileHandle for std::fs::File {
let fd = self.as_fd();
let mut kif = MaybeUninit::<libc::kinfo_file>::uninit();
@@ -21,7 +21,7 @@
let result = unsafe { libc::fcntl(fd.as_raw_fd(), libc::F_KINFO, kif.as_mut_ptr()) };
if result == -1 {
-@@ -378,6 +381,11 @@ impl FileHandle for std::fs::File {
+@@ -380,6 +383,11 @@ impl FileHandle for std::fs::File {
let c_str = unsafe { CStr::from_ptr(kif.assume_init().kf_path.as_ptr()) };
let path = PathBuf::from(OsStr::from_bytes(c_str.to_bytes()));
Ok(path)
diff --git a/editors/zed/files/patch-crates_project_src_agent__server__store.rs b/editors/zed/files/patch-crates_project_src_agent__server__store.rs
index 2092c8e707a7..70e513052587 100644
--- a/editors/zed/files/patch-crates_project_src_agent__server__store.rs
+++ b/editors/zed/files/patch-crates_project_src_agent__server__store.rs
@@ -1,6 +1,6 @@
---- crates/project/src/agent_server_store.rs.orig 2025-12-03 16:43:47 UTC
+--- crates/project/src/agent_server_store.rs.orig 2025-12-11 21:24:05 UTC
+++ crates/project/src/agent_server_store.rs
-@@ -1494,6 +1494,8 @@ fn get_platform_info() -> Option<(&'static str, &'stat
+@@ -1519,6 +1519,8 @@ fn get_platform_info() -> Option<(&'static str, &'stat
"pc-windows-msvc"
} else if cfg!(target_os = "linux") {
"unknown-linux-gnu"
@@ -9,7 +9,7 @@
} else {
return None;
};
-@@ -1580,6 +1582,8 @@ impl ExternalAgentServer for LocalExtensionArchiveAgen
+@@ -1605,6 +1607,8 @@ impl ExternalAgentServer for LocalExtensionArchiveAgen
"linux"
} else if cfg!(target_os = "windows") {
"windows"
diff --git a/editors/zed/files/patch-crates_remote__server_src_unix.rs b/editors/zed/files/patch-crates_remote__server_src_unix.rs
index 7cf7b1a8115d..45bb9ed0564b 100644
--- a/editors/zed/files/patch-crates_remote__server_src_unix.rs
+++ b/editors/zed/files/patch-crates_remote__server_src_unix.rs
@@ -1,6 +1,6 @@
---- crates/remote_server/src/unix.rs.orig 2025-12-03 16:43:47 UTC
+--- crates/remote_server/src/unix.rs.orig 2025-12-11 21:24:05 UTC
+++ crates/remote_server/src/unix.rs
-@@ -355,6 +355,7 @@ pub fn execute_run(
+@@ -356,6 +356,7 @@ pub fn execute_run(
let app = gpui::Application::headless();
let id = std::process::id().to_string();
@@ -8,7 +8,7 @@
app.background_executor()
.spawn(crashes::init(crashes::InitCrashHandler {
session_id: id,
-@@ -573,6 +574,7 @@ pub(crate) fn execute_proxy(
+@@ -581,6 +582,7 @@ pub(crate) fn execute_proxy(
let server_paths = ServerPaths::new(&identifier)?;
let id = std::process::id().to_string();
diff --git a/editors/zed/files/patch-crates_remote_src_transport_ssh.rs b/editors/zed/files/patch-crates_remote_src_transport_ssh.rs
index ba344951a7a5..21fadf3fcc98 100644
--- a/editors/zed/files/patch-crates_remote_src_transport_ssh.rs
+++ b/editors/zed/files/patch-crates_remote_src_transport_ssh.rs
@@ -1,21 +1,21 @@
---- crates/remote/src/transport/ssh.rs.orig 2025-12-03 16:43:47 UTC
+--- crates/remote/src/transport/ssh.rs.orig 2025-12-11 21:24:05 UTC
+++ crates/remote/src/transport/ssh.rs
-@@ -1059,6 +1059,7 @@ impl SshSocket {
- let os = match os.trim() {
- "Darwin" => "macos",
- "Linux" => "linux",
-+ "FreeBSD" => "freebsd",
- _ => anyhow::bail!(
- "Prebuilt remote servers are not yet available for {os:?}. See https://zed.dev/docs/remote-development"
- ),
-@@ -1070,7 +1071,9 @@ impl SshSocket {
- || arch.starts_with("aarch64")
- {
- "aarch64"
-- } else if arch.starts_with("x86") {
-+ } else if arch.starts_with("x86")
-+ || arch.starts_with("amd64")
-+ {
- "x86_64"
- } else {
- anyhow::bail!(
+@@ -1087,6 +1087,7 @@ fn parse_platform(output: &str) -> Result<RemotePlatfo
+ let os = match os {
+ "Darwin" => "macos",
+ "Linux" => "linux",
++ "FreeBSD" => "freebsd",
+ _ => anyhow::bail!(
+ "Prebuilt remote servers are not yet available for {os:?}. See https://zed.dev/docs/remote-development"
+ ),
+@@ -1099,7 +1100,9 @@ fn parse_platform(output: &str) -> Result<RemotePlatfo
+ || arch.starts_with("aarch64")
+ {
+ "aarch64"
+- } else if arch.starts_with("x86") {
++ } else if arch.starts_with("x86")
++ || arch.starts_with("amd64")
++ {
+ "x86_64"
+ } else {
+ anyhow::bail!(
diff --git a/editors/zed/files/patch-crates_zed_src_main.rs b/editors/zed/files/patch-crates_zed_src_main.rs
index 779136d84aa1..6f71c25603a2 100644
--- a/editors/zed/files/patch-crates_zed_src_main.rs
+++ b/editors/zed/files/patch-crates_zed_src_main.rs
@@ -1,4 +1,4 @@
---- crates/zed/src/main.rs.orig 2025-12-03 16:43:47 UTC
+--- crates/zed/src/main.rs.orig 2025-12-11 21:24:05 UTC
+++ crates/zed/src/main.rs
@@ -8,6 +8,7 @@ use collections::HashMap;
use client::{Client, ProxySettings, UserStore, parse_zed_link};
@@ -16,15 +16,15 @@
if let Some(socket) = &args.crash_handler {
crashes::crash_server(socket.as_path());
return;
-@@ -292,6 +294,7 @@ pub fn main() {
- let session_id = Uuid::new_v4().to_string();
- let session = app.background_executor().block(Session::new());
+@@ -294,6 +296,7 @@ pub fn main() {
+ .background_executor()
+ .spawn(Session::new(session_id.clone()));
+ #[cfg(not(target_os = "freebsd"))]
app.background_executor()
.spawn(crashes::init(InitCrashHandler {
- session_id: session_id.clone(),
-@@ -545,6 +548,7 @@ pub fn main() {
+ session_id,
+@@ -552,6 +555,7 @@ pub fn main() {
auto_update::init(client.clone(), cx);
dap_adapters::init(cx);
auto_update_ui::init(cx);
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-15 01:20:45 +0000