From 2c979c32c53707580a4f71c46f503e705906f5d0 Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Sat, 19 Oct 2024 01:21:31 +0800 Subject: [PATCH] linux: Fix #104 Linux platform crash with BorrowMutError. (#367) ![Screenshot from 2024-10-19 01-20-24](https://github.com/user-attachments/assets/cc0d2250-38ae-4381-a06c-c64ec309ee4c) --- Cargo.lock | 26 +++++++++++++------------- crates/app/src/story_workspace.rs | 3 +++ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index be2a874f..14a36037 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -474,7 +474,7 @@ dependencies = [ "bitflags 2.6.0", "cexpr", "clang-sys", - "itertools 0.11.0", + "itertools 0.13.0", "log", "prettyplease", "proc-macro2", @@ -947,7 +947,7 @@ dependencies = [ [[package]] name = "collections" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#d048d70f8d4349dddbae0bea280d3264d87ba22f" +source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#4e0dab0d4e19fbbb26e366ac819fe154e9c40ab9" dependencies = [ "rustc-hash", ] @@ -1282,7 +1282,7 @@ dependencies = [ [[package]] name = "derive_refineable" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#d048d70f8d4349dddbae0bea280d3264d87ba22f" +source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#4e0dab0d4e19fbbb26e366ac819fe154e9c40ab9" dependencies = [ "proc-macro2", "quote", @@ -2223,7 +2223,7 @@ dependencies = [ [[package]] name = "gpui" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#d048d70f8d4349dddbae0bea280d3264d87ba22f" +source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#4e0dab0d4e19fbbb26e366ac819fe154e9c40ab9" dependencies = [ "anyhow", "as-raw-xcb-connection", @@ -2322,7 +2322,7 @@ dependencies = [ [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#d048d70f8d4349dddbae0bea280d3264d87ba22f" +source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#4e0dab0d4e19fbbb26e366ac819fe154e9c40ab9" dependencies = [ "proc-macro2", "quote", @@ -2506,7 +2506,7 @@ dependencies = [ [[package]] name = "http_client" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#d048d70f8d4349dddbae0bea280d3264d87ba22f" +source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#4e0dab0d4e19fbbb26e366ac819fe154e9c40ab9" dependencies = [ "anyhow", "bytes", @@ -3023,7 +3023,7 @@ dependencies = [ [[package]] name = "media" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#d048d70f8d4349dddbae0bea280d3264d87ba22f" +source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#4e0dab0d4e19fbbb26e366ac819fe154e9c40ab9" dependencies = [ "anyhow", "bindgen", @@ -4288,7 +4288,7 @@ dependencies = [ [[package]] name = "refineable" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#d048d70f8d4349dddbae0bea280d3264d87ba22f" +source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#4e0dab0d4e19fbbb26e366ac819fe154e9c40ab9" dependencies = [ "derive_refineable", ] @@ -4591,7 +4591,7 @@ checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" [[package]] name = "semantic_version" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#d048d70f8d4349dddbae0bea280d3264d87ba22f" +source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#4e0dab0d4e19fbbb26e366ac819fe154e9c40ab9" dependencies = [ "anyhow", "serde", @@ -5008,7 +5008,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_tree" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#d048d70f8d4349dddbae0bea280d3264d87ba22f" +source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#4e0dab0d4e19fbbb26e366ac819fe154e9c40ab9" dependencies = [ "arrayvec", "log", @@ -5616,7 +5616,7 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "util" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#d048d70f8d4349dddbae0bea280d3264d87ba22f" +source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#4e0dab0d4e19fbbb26e366ac819fe154e9c40ab9" dependencies = [ "anyhow", "async-fs 1.6.0", @@ -6354,9 +6354,9 @@ dependencies = [ [[package]] name = "wry" -version = "0.46.1" +version = "0.46.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f8c948dc5f7c23bd93ba03b85b7f679852589bb78e150424d993171e4ef7b73" +checksum = "6fa1c8c760041c64ce6be99f83d6cb55fe3fcd85a1ad46d32895f6e65cee87ba" dependencies = [ "base64", "block2", diff --git a/crates/app/src/story_workspace.rs b/crates/app/src/story_workspace.rs index d1e4b52c..2bd2c383 100644 --- a/crates/app/src/story_workspace.rs +++ b/crates/app/src/story_workspace.rs @@ -55,6 +55,9 @@ struct DockAreaTab { impl StoryWorkspace { pub fn new(_app_state: Arc, cx: &mut ViewContext) -> Self { + // There will crash on Linux. + // https://github.com/longbridgeapp/gpui-component/issues/104 + #[cfg(not(target_os = "linux"))] cx.observe_window_appearance(|_, cx| { Theme::sync_system_appearance(cx); })