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.lock18
-rw-r--r--editors/zed/files/patch-crates_project_src_agent__server__store.rs6
-rw-r--r--editors/zed/files/patch-crates_remote_src_transport.rs (renamed from editors/zed/files/patch-crates_remote_src_transport_ssh.rs)10
-rw-r--r--editors/zed/files/patch-crates_zed_Cargo.toml6
-rw-r--r--editors/zed/files/patch-crates_zed_src_main.rs8
5 files changed, 24 insertions, 24 deletions
diff --git a/editors/zed/files/patch-Cargo.lock b/editors/zed/files/patch-Cargo.lock
index 1752a65915d6..517779c42569 100644
--- a/editors/zed/files/patch-Cargo.lock
+++ b/editors/zed/files/patch-Cargo.lock
@@ -1,6 +1,6 @@
---- Cargo.lock.orig 2025-12-11 21:24:05 UTC
+--- Cargo.lock.orig 2025-12-19 13:27:12 UTC
+++ Cargo.lock
-@@ -8382,21 +8382,20 @@ name = "ipc-channel"
+@@ -8323,21 +8323,20 @@ name = "ipc-channel"
[[package]]
name = "ipc-channel"
@@ -10,7 +10,7 @@
-checksum = "6fb8251fb7bcd9ccd3725ed8deae9fe7db8e586495c9eb5b0c52e6233e5e75ea"
+checksum = "f93600b5616c2d075f8af8dbd23c1d69278c5d24e4913d220cbc60b14c95c180"
dependencies = [
- "bincode 1.3.3",
+ "bincode",
"crossbeam-channel",
"fnv",
- "lazy_static",
@@ -26,7 +26,7 @@
]
[[package]]
-@@ -19858,16 +19857,6 @@ name = "windows"
+@@ -19129,16 +19128,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"
-@@ -19926,19 +19915,6 @@ name = "windows-core"
+@@ -19197,19 +19186,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"
-@@ -19987,17 +19963,6 @@ name = "windows-implement"
+@@ -19258,17 +19234,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"
-@@ -20020,17 +19985,6 @@ name = "windows-interface"
+@@ -19291,17 +19256,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"
-@@ -20106,15 +20060,6 @@ name = "windows-result"
+@@ -19377,15 +19331,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"
-@@ -20129,16 +20074,6 @@ dependencies = [
+@@ -19400,16 +19345,6 @@ dependencies = [
checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
dependencies = [
"windows-link 0.2.1",
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 70e513052587..b47902035b77 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-11 21:24:05 UTC
+--- crates/project/src/agent_server_store.rs.orig 2025-12-18 17:41:26 UTC
+++ crates/project/src/agent_server_store.rs
-@@ -1519,6 +1519,8 @@ fn get_platform_info() -> Option<(&'static str, &'stat
+@@ -1576,6 +1576,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;
};
-@@ -1605,6 +1607,8 @@ impl ExternalAgentServer for LocalExtensionArchiveAgen
+@@ -1662,6 +1664,8 @@ impl ExternalAgentServer for LocalExtensionArchiveAgen
"linux"
} else if cfg!(target_os = "windows") {
"windows"
diff --git a/editors/zed/files/patch-crates_remote_src_transport_ssh.rs b/editors/zed/files/patch-crates_remote_src_transport.rs
index 21fadf3fcc98..cc548bd5396d 100644
--- a/editors/zed/files/patch-crates_remote_src_transport_ssh.rs
+++ b/editors/zed/files/patch-crates_remote_src_transport.rs
@@ -1,6 +1,6 @@
---- crates/remote/src/transport/ssh.rs.orig 2025-12-11 21:24:05 UTC
-+++ crates/remote/src/transport/ssh.rs
-@@ -1087,6 +1087,7 @@ fn parse_platform(output: &str) -> Result<RemotePlatfo
+--- crates/remote/src/transport.rs.orig 2025-12-19 13:24:55 UTC
++++ crates/remote/src/transport.rs
+@@ -27,6 +27,7 @@ fn parse_platform(output: &str) -> Result<RemotePlatfo
let os = match os {
"Darwin" => "macos",
"Linux" => "linux",
@@ -8,13 +8,13 @@
_ => 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
+@@ -39,7 +40,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")
++ || arch.starts_with("amd64")
+ {
"x86_64"
} else {
diff --git a/editors/zed/files/patch-crates_zed_Cargo.toml b/editors/zed/files/patch-crates_zed_Cargo.toml
index de8af5d6133c..ba3632755404 100644
--- a/editors/zed/files/patch-crates_zed_Cargo.toml
+++ b/editors/zed/files/patch-crates_zed_Cargo.toml
@@ -1,6 +1,6 @@
---- crates/zed/Cargo.toml.orig 2025-12-03 16:43:47 UTC
+--- crates/zed/Cargo.toml.orig 2025-12-18 17:41:26 UTC
+++ crates/zed/Cargo.toml
-@@ -42,7 +42,6 @@ copilot.workspace = true
+@@ -45,7 +45,6 @@ copilot.workspace = true
command_palette.workspace = true
component.workspace = true
copilot.workspace = true
@@ -8,7 +8,7 @@
dap_adapters.workspace = true
db.workspace = true
debug_adapter_extension.workspace = true
-@@ -174,6 +173,9 @@ ashpd.workspace = true
+@@ -178,6 +177,9 @@ ashpd.workspace = true
[target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
ashpd.workspace = true
diff --git a/editors/zed/files/patch-crates_zed_src_main.rs b/editors/zed/files/patch-crates_zed_src_main.rs
index 6f71c25603a2..fcf04fd58ac9 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-11 21:24:05 UTC
+--- crates/zed/src/main.rs.orig 2025-12-18 17:41:26 UTC
+++ crates/zed/src/main.rs
@@ -8,6 +8,7 @@ use collections::HashMap;
use client::{Client, ProxySettings, UserStore, parse_zed_link};
@@ -8,7 +8,7 @@
use crashes::InitCrashHandler;
use db::kvp::{GLOBAL_KEY_VALUE_STORE, KEY_VALUE_STORE};
use editor::Editor;
-@@ -181,6 +182,7 @@ pub fn main() {
+@@ -183,6 +184,7 @@ pub fn main() {
}
// `zed --crash-handler` Makes zed operate in minidump crash handler mode
@@ -16,7 +16,7 @@
if let Some(socket) = &args.crash_handler {
crashes::crash_server(socket.as_path());
return;
-@@ -294,6 +296,7 @@ pub fn main() {
+@@ -296,6 +298,7 @@ pub fn main() {
.background_executor()
.spawn(Session::new(session_id.clone()));
@@ -24,7 +24,7 @@
app.background_executor()
.spawn(crashes::init(InitCrashHandler {
session_id,
-@@ -552,6 +555,7 @@ pub fn main() {
+@@ -554,6 +557,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-20 21:17:47 +0000