diff --git a/Cargo.lock b/Cargo.lock index 3f0575d164..6c7abc158d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -285,9 +285,9 @@ dependencies = [ [[package]] name = "ashpd" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01992ad7774250d5b7fe214e2676cb99bf92564436d8135ab44fe815e71769a9" +checksum = "1b22517ee647547c01a687cf9b76074e1c91334032a4324f7243c6ee0f949390" dependencies = [ "async-fs 2.1.1", "async-net 2.0.0", @@ -298,7 +298,7 @@ dependencies = [ "serde", "serde_repr", "url", - "zbus 3.15.1", + "zbus", ] [[package]] @@ -351,16 +351,6 @@ dependencies = [ "workspace", ] -[[package]] -name = "async-broadcast" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" -dependencies = [ - "event-listener 2.5.3", - "futures-core", -] - [[package]] name = "async-broadcast" version = "0.7.0" @@ -2792,7 +2782,7 @@ dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.9.0", + "memoffset", "scopeguard", ] @@ -3836,9 +3826,9 @@ checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -4731,9 +4721,9 @@ checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -5487,7 +5477,7 @@ name = "live_kit_client" version = "0.1.0" dependencies = [ "anyhow", - "async-broadcast 0.7.0", + "async-broadcast", "async-trait", "collections", "core-foundation", @@ -5734,15 +5724,6 @@ dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.9.0" @@ -5980,18 +5961,6 @@ dependencies = [ "libc", ] -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.7.1", -] - [[package]] name = "nix" version = "0.27.1" @@ -6001,7 +5970,7 @@ dependencies = [ "bitflags 2.4.2", "cfg-if", "libc", - "memoffset 0.9.0", + "memoffset", ] [[package]] @@ -6370,9 +6339,9 @@ dependencies = [ "rand 0.8.5", "serde", "sha2 0.10.7", - "zbus 4.0.1", + "zbus", "zeroize", - "zvariant 4.0.2", + "zvariant", ] [[package]] @@ -6383,9 +6352,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "open" -version = "5.0.1" +version = "5.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90878fb664448b54c4e592455ad02831e23a3f7e157374a8b95654731aac7349" +checksum = "449f0ff855d85ddbf1edd5b646d65249ead3f5e422aaa86b7d2d0b049b103e32" dependencies = [ "is-wsl", "libc", @@ -6707,9 +6676,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "petgraph" @@ -10611,7 +10580,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ - "memoffset 0.9.0", + "memoffset", "tempfile", "winapi", ] @@ -10748,9 +10717,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -11331,7 +11300,7 @@ dependencies = [ "log", "mach", "memfd", - "memoffset 0.9.0", + "memoffset", "paste", "psm", "rustix 0.38.32", @@ -12361,54 +12330,13 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "zbus" -version = "3.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5acecd3f8422f198b1a2f954bcc812fe89f3fa4281646f3da1da7925db80085d" -dependencies = [ - "async-broadcast 0.5.1", - "async-executor", - "async-fs 1.6.0", - "async-io 1.13.0", - "async-lock 2.8.0", - "async-process 1.7.0", - "async-recursion 1.0.5", - "async-task", - "async-trait", - "blocking", - "byteorder", - "derivative", - "enumflags2", - "event-listener 2.5.3", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix 0.26.4", - "once_cell", - "ordered-stream", - "rand 0.8.5", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tracing", - "uds_windows", - "winapi", - "xdg-home", - "zbus_macros 3.15.1", - "zbus_names 2.6.1", - "zvariant 3.15.1", -] - [[package]] name = "zbus" version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b8e3d6ae3342792a6cc2340e4394334c7402f3d793b390d2c5494a4032b3030" dependencies = [ - "async-broadcast 0.7.0", + "async-broadcast", "async-executor", "async-fs 2.1.1", "async-io 2.3.1", @@ -12436,23 +12364,9 @@ dependencies = [ "uds_windows", "windows-sys 0.52.0", "xdg-home", - "zbus_macros 4.0.1", - "zbus_names 3.0.0", - "zvariant 4.0.2", -] - -[[package]] -name = "zbus_macros" -version = "3.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2207eb71efebda17221a579ca78b45c4c5f116f074eb745c3a172e688ccf89f5" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "regex", - "syn 1.0.109", - "zvariant_utils", + "zbus_macros", + "zbus_names", + "zvariant", ] [[package]] @@ -12469,17 +12383,6 @@ dependencies = [ "zvariant_utils", ] -[[package]] -name = "zbus_names" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" -dependencies = [ - "serde", - "static_assertions", - "zvariant 3.15.1", -] - [[package]] name = "zbus_names" version = "3.0.0" @@ -12488,7 +12391,7 @@ checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", - "zvariant 4.0.2", + "zvariant", ] [[package]] @@ -12694,21 +12597,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "zvariant" -version = "3.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5b4fcf3660d30fc33ae5cd97e2017b23a96e85afd7a1dd014534cd0bf34ba67" -dependencies = [ - "byteorder", - "enumflags2", - "libc", - "serde", - "static_assertions", - "url", - "zvariant_derive 3.15.1", -] - [[package]] name = "zvariant" version = "4.0.2" @@ -12719,20 +12607,8 @@ dependencies = [ "enumflags2", "serde", "static_assertions", - "zvariant_derive 4.0.2", -] - -[[package]] -name = "zvariant_derive" -version = "3.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0277758a8a0afc0e573e80ed5bfd9d9c2b48bd3108ffe09384f9f738c83f4a55" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 1.0.109", - "zvariant_utils", + "url", + "zvariant_derive", ] [[package]] diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml index 528e312574..f76d833947 100644 --- a/crates/gpui/Cargo.toml +++ b/crates/gpui/Cargo.toml @@ -105,9 +105,11 @@ cosmic-text = "0.10.0" copypasta = "0.10.1" [target.'cfg(target_os = "linux")'.dependencies] -open = "5.0.1" -ashpd = "0.7.0" -x11rb = { version = "0.13.0", features = ["allow-unsafe-code", "xkb", "randr"] } +as-raw-xcb-connection = "1" +ashpd = "0.8.0" +calloop = "0.12.4" +calloop-wayland-source = "0.2.0" +wayland-backend = { version = "0.3.3", features = ["client_system"] } wayland-client = { version = "0.31.2" } wayland-cursor = "0.31.1" wayland-protocols = { version = "0.31.2", features = [ @@ -115,12 +117,10 @@ wayland-protocols = { version = "0.31.2", features = [ "staging", "unstable", ] } -wayland-backend = { version = "0.3.3", features = ["client_system"] } -xkbcommon = { version = "0.7", features = ["wayland", "x11"] } -as-raw-xcb-connection = "1" -calloop = "0.12.4" -calloop-wayland-source = "0.2.0" oo7 = "0.3.0" +open = "5.1.2" +x11rb = { version = "0.13.0", features = ["allow-unsafe-code", "xkb", "randr"] } +xkbcommon = { version = "0.7", features = ["wayland", "x11"] } [target.'cfg(windows)'.dependencies] windows.workspace = true