Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

gpui_platform: Forward `gpui_web`s multithreaded feature instead of forcing it (#65289)

Hernán Fernándeza2a92fe7c442
diff --git a/Cargo.toml b/Cargo.toml
index eae064c0628..387be9f6e35 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -373,7 +373,7 @@ gpui_platform = { path = "crates/gpui_platform", default-features = false }
gpui_shared_string = { path = "crates/gpui_shared_string" }
gpui_tokio = { path = "crates/gpui_tokio" }
gpui_util = { path = "crates/gpui_util" }
-gpui_web = { path = "crates/gpui_web" }
+gpui_web = { path = "crates/gpui_web", default-features = false }
gpui_wgpu = { path = "crates/gpui_wgpu" }
gpui_windows = { path = "crates/gpui_windows", default-features = false }
grammars = { path = "crates/grammars" }
diff --git a/crates/gpui_platform/Cargo.toml b/crates/gpui_platform/Cargo.toml
index daf154f0f1d..11ff9e182b1 100644
--- a/crates/gpui_platform/Cargo.toml
+++ b/crates/gpui_platform/Cargo.toml
@@ -13,7 +13,10 @@ path = "src/gpui_platform.rs"
doctest = false
[features]
-default = []
+default = ["multithreaded"]
+# Threads in the browser: needs a nightly toolchain and a cross-origin-isolated
+# page. Off, gpui_web builds on stable.
+multithreaded = ["gpui_web/multithreaded"]
bench-support = ["gpui/bench-support", "gpui_macos/bench-support", "gpui_wgpu/bench-support"]
font-kit = ["gpui_macos/font-kit"]
inspector = ["gpui/inspector"]