Cole Miller
ad0d789038
`wayland-backend` falls back to `eprintln!` when its optional `log` feature is disabled. If a Wayland connection fails while standard error is unavailable, that fallback panics while trying to report the original error. Closes ZED-8BW Enable the existing `log` feature on `gpui_linux`'s direct `wayland-backend` dependency. `gpui_linux` already depends on the `log` facade, so this introduces no new logging system; it routes backend errors through the configured logger and avoids the secondary standard-error panic. Testing performed: Release Notes: - Fixed a Linux crash when reporting a Wayland connection error while standard error is unavailable.
134 lines
3.2 KiB
TOML
134 lines
3.2 KiB
TOML
[package]
|
|
name = "gpui_linux"
|
|
version = "0.1.0"
|
|
edition.workspace = true
|
|
publish.workspace = true
|
|
license = "Apache-2.0"
|
|
|
|
[lints]
|
|
workspace = true
|
|
|
|
[lib]
|
|
path = "src/gpui_linux.rs"
|
|
|
|
[features]
|
|
default = ["wayland", "x11"]
|
|
test-support = ["gpui/test-support"]
|
|
wayland = [
|
|
"bitflags",
|
|
"gpui_wgpu",
|
|
"ashpd/wayland",
|
|
|
|
"calloop-wayland-source",
|
|
"wayland-backend",
|
|
"wayland-client",
|
|
"wayland-cursor",
|
|
"wayland-protocols",
|
|
"wayland-protocols-plasma",
|
|
"wayland-protocols-wlr",
|
|
"filedescriptor",
|
|
"xkbcommon/wayland",
|
|
"open",
|
|
"gpui/wayland",
|
|
]
|
|
x11 = [
|
|
"gpui_wgpu",
|
|
"ashpd",
|
|
|
|
"as-raw-xcb-connection",
|
|
"x11rb",
|
|
"xkbcommon/x11",
|
|
"xim",
|
|
"x11-clipboard",
|
|
"filedescriptor",
|
|
"open",
|
|
"scap?/x11",
|
|
]
|
|
screen-capture = [
|
|
"gpui/screen-capture",
|
|
"scap",
|
|
]
|
|
|
|
|
|
[target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
|
|
accesskit.workspace = true
|
|
accesskit_unix.workspace = true
|
|
anyhow.workspace = true
|
|
bytemuck = "1"
|
|
collections.workspace = true
|
|
futures.workspace = true
|
|
gpui.workspace = true
|
|
gpui_util.workspace = true
|
|
gpui_wgpu = { workspace = true, optional = true, features = ["font-kit"] }
|
|
http_client.workspace = true
|
|
libc.workspace = true
|
|
log.workspace = true
|
|
parking_lot.workspace = true
|
|
smallvec.workspace = true
|
|
smol.workspace = true
|
|
strum.workspace = true
|
|
url.workspace = true
|
|
uuid.workspace = true
|
|
|
|
# Always used
|
|
oo7 = { version = "0.6", default-features = false, features = [
|
|
"async-std",
|
|
"native_crypto",
|
|
] }
|
|
calloop = "0.14.3"
|
|
notify-rust.workspace = true
|
|
raw-window-handle.workspace = true
|
|
|
|
# Used in both windowing options
|
|
ashpd = { workspace = true, optional = true }
|
|
bitflags = { workspace = true, optional = true }
|
|
filedescriptor = { version = "0.8.2", optional = true }
|
|
open = { version = "5.2.0", optional = true }
|
|
xkbcommon = { version = "0.8.0", default-features = false, optional = true }
|
|
|
|
# Screen capture
|
|
scap = { workspace = true, optional = true }
|
|
|
|
# Wayland
|
|
calloop-wayland-source = { version = "0.4.1", optional = true }
|
|
wayland-backend = { version = "0.3.15", features = [
|
|
"client_system",
|
|
"dlopen",
|
|
"log",
|
|
], optional = true }
|
|
wayland-client = { version = "0.31.11", optional = true }
|
|
wayland-cursor = { version = "0.31.11", optional = true }
|
|
wayland-protocols = { version = "0.32.9", features = [
|
|
"client",
|
|
"staging",
|
|
"unstable",
|
|
], optional = true }
|
|
wayland-protocols-plasma = { version = "0.3.9", features = [
|
|
"client",
|
|
], optional = true }
|
|
wayland-protocols-wlr = { version = "0.3.9", features = [
|
|
"client",
|
|
], optional = true }
|
|
|
|
# X11
|
|
as-raw-xcb-connection = { version = "1", optional = true }
|
|
x11rb = { version = "0.13.1", features = [
|
|
"allow-unsafe-code",
|
|
"xkb",
|
|
"randr",
|
|
"xinput",
|
|
"cursor",
|
|
"resource_manager",
|
|
"sync",
|
|
"dri3",
|
|
], optional = true }
|
|
# WARNING: If you change this, you must also publish a new version of zed-xim to crates.io
|
|
xim = { git = "https://github.com/zed-industries/xim-rs.git", rev = "16f35a2c881b815a2b6cdfd6687988e84f8447d8", features = [
|
|
"x11rb-xcb",
|
|
"x11rb-client",
|
|
], package = "zed-xim", version = "0.4.0-zed", optional = true }
|
|
x11-clipboard = { version = "0.9.3", optional = true }
|
|
|
|
[package.metadata.cargo-shear]
|
|
ignored = ["bitflags", "scap", "x11-clipboard"]
|