From 2c16d662092ecef4a6177012ebd09f5cf2c13942 Mon Sep 17 00:00:00 2001 From: Josh Megnauth Date: Thu, 29 Jan 2026 15:14:49 -0500 Subject: [PATCH] Bump compio; remove unused dependency --- Cargo.lock | 142 ++++++++++++++--------------------------------------- Cargo.toml | 12 +---- 2 files changed, 38 insertions(+), 116 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a523c892..affa1344 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -727,29 +727,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bindgen" -version = "0.69.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" -dependencies = [ - "bitflags 2.10.0", - "cexpr", - "clang-sys", - "itertools 0.12.1", - "lazy_static", - "lazycell", - "log", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash 1.1.0", - "shlex", - "syn 2.0.114", - "which", -] - [[package]] name = "bit-set" version = "0.6.0" @@ -1015,15 +992,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom 7.1.3", -] - [[package]] name = "cfb" version = "0.7.3" @@ -1088,17 +1056,6 @@ dependencies = [ "inout", ] -[[package]] -name = "clang-sys" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" -dependencies = [ - "glob", - "libc", - "libloading", -] - [[package]] name = "clipboard-win" version = "5.4.1" @@ -1232,8 +1189,9 @@ dependencies = [ [[package]] name = "compio" -version = "0.17.0" -source = "git+https://github.com/jackpot51/compio.git#8235a1fcccde233362bb76df45b509c12ca79972" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b84ee96a86948d04388f3a0b8c36b9f0a6b40b3528ac0d65737e53632fb37fe" dependencies = [ "compio-buf", "compio-driver", @@ -1246,8 +1204,9 @@ dependencies = [ [[package]] name = "compio-buf" -version = "0.7.1" -source = "git+https://github.com/jackpot51/compio.git#8235a1fcccde233362bb76df45b509c12ca79972" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e8777c3ad31ab42f8a3a4a1bd629b78f688371df9b0f528d94dfbdbe5c945c9" dependencies = [ "arrayvec", "bytes", @@ -1256,8 +1215,9 @@ dependencies = [ [[package]] name = "compio-driver" -version = "0.10.0" -source = "git+https://github.com/jackpot51/compio.git#8235a1fcccde233362bb76df45b509c12ca79972" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "042d449def75fb78af58e53e865dd1343c36255294466e0abd5464b70a525be4" dependencies = [ "cfg-if", "cfg_aliases 0.2.1", @@ -1274,15 +1234,18 @@ dependencies = [ "pin-project-lite", "polling 3.11.0", "slab", + "smallvec", "socket2 0.6.2", + "synchrony", "thin-cell", "windows-sys 0.61.2", ] [[package]] name = "compio-fs" -version = "0.10.0" -source = "git+https://github.com/jackpot51/compio.git#8235a1fcccde233362bb76df45b509c12ca79972" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65ee36e1acf2cec4835efe9a986c012b2462c5ef53580e4ee84ae6d5a3d8e3b3" dependencies = [ "cfg-if", "cfg_aliases 0.2.1", @@ -1292,24 +1255,28 @@ dependencies = [ "compio-runtime", "libc", "os_pipe", + "pin-project-lite", "widestring", "windows-sys 0.61.2", ] [[package]] name = "compio-io" -version = "0.8.4" -source = "git+https://github.com/jackpot51/compio.git#8235a1fcccde233362bb76df45b509c12ca79972" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b914ea4883d9a5b44b328c04e4d23011f043228b0282d1e4b9100ce6507594cc" dependencies = [ "compio-buf", "futures-util", "paste", + "synchrony", ] [[package]] name = "compio-log" version = "0.1.0" -source = "git+https://github.com/jackpot51/compio.git#8235a1fcccde233362bb76df45b509c12ca79972" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc4e560213c1996b618da369b7c9109564b41af9033802ae534465c4ee4e132f" dependencies = [ "tracing", ] @@ -1317,7 +1284,8 @@ dependencies = [ [[package]] name = "compio-macros" version = "0.1.2" -source = "git+https://github.com/jackpot51/compio.git#8235a1fcccde233362bb76df45b509c12ca79972" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f05ed201484967dc70de77a8f7a02b29aaa8e6c81cbea2e75492ee0c8d97766b" dependencies = [ "proc-macro-crate 3.4.0", "proc-macro2", @@ -1327,8 +1295,9 @@ dependencies = [ [[package]] name = "compio-runtime" -version = "0.10.1" -source = "git+https://github.com/jackpot51/compio.git#8235a1fcccde233362bb76df45b509c12ca79972" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6c1c71f011bdd9c8f30e97d877b606505ee6d241c7782cfaed172f66acbd9cd" dependencies = [ "async-task", "compio-buf", @@ -1498,7 +1467,6 @@ dependencies = [ "icu", "ignore", "image", - "io-uring", "jxl-oxide", "libc", "libcosmic", @@ -3096,15 +3064,6 @@ dependencies = [ "digest", ] -[[package]] -name = "home" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" -dependencies = [ - "windows-sys 0.59.0", -] - [[package]] name = "i18n-config" version = "0.4.8" @@ -4027,7 +3986,6 @@ version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdd7bddefd0a8833b88a4b68f90dae22c7450d11b354198baee3874fd811b344" dependencies = [ - "bindgen", "bitflags 2.10.0", "cfg-if", "libc", @@ -4069,15 +4027,6 @@ version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.14.0" @@ -4433,12 +4382,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "lebe" version = "0.5.3" @@ -5886,16 +5829,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" -[[package]] -name = "prettyplease" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" -dependencies = [ - "proc-macro2", - "syn 2.0.114", -] - [[package]] name = "proc-macro-crate" version = "1.3.1" @@ -6162,7 +6095,7 @@ dependencies = [ "built", "cfg-if", "interpolate_name", - "itertools 0.14.0", + "itertools", "libc", "libfuzzer-sys", "log", @@ -7054,6 +6987,15 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "synchrony" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0208d3660701622272151bc63c35f5d32ca3d45c19785a9a8dc04dc797dc43" +dependencies = [ + "futures-util", +] + [[package]] name = "synstructure" version = "0.13.2" @@ -8212,18 +8154,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix 0.38.44", -] - [[package]] name = "widestring" version = "1.2.1" diff --git a/Cargo.toml b/Cargo.toml index ec98167e..89e21567 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -65,17 +65,10 @@ num_cpus = "1.17.0" # Completion-based IO runtime to enable io_uring / IOCP file IO support. [dependencies.compio] -# Patched to fix mtime: https://github.com/compio-rs/compio/pull/625 -# version = "0.17.0" -git = "https://github.com/jackpot51/compio.git" +version = "0.18" default-features = false features = ["fs", "io", "macros", "polling", "runtime"] -[dependencies.io-uring] -version = "0.7.11" -default-features = false -optional = true - [dependencies.libcosmic] git = "https://github.com/pop-os/libcosmic.git" default-features = false @@ -117,8 +110,7 @@ dbus-config = ["libcosmic/dbus-config"] desktop = ["libcosmic/desktop", "dep:cosmic-mime-apps", "dep:xdg"] desktop-applet = [] gvfs = ["dep:gio", "dep:glib"] -io-uring = ["compio/io-uring", "dep:io-uring"] -io-uring-bindgen = ["io-uring?/bindgen"] +io-uring = ["compio/io-uring"] jemalloc = ["dep:tikv-jemallocator"] notify = ["dep:notify-rust"] wayland = ["libcosmic/wayland", "dep:cctk", "dep:wayland-client"]