diff --git a/Cargo.lock b/Cargo.lock index de6b2b658b..0d645390a9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -43,22 +43,22 @@ dependencies = [ [[package]] name = "anstyle-query" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2" +checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] name = "anstyle-wincon" -version = "3.0.10" +version = "3.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a" +checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -104,9 +104,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "axum" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18ed336352031311f4e0b4dd2ff392d4fbb370777c9d18d7fc9d7359f73871" +checksum = "5b098575ebe77cb6d14fc7f32749631a6e44edbef6b796f89b020e99ba20d425" dependencies = [ "axum-core", "base64", @@ -165,9 +165,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.9.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" +checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" [[package]] name = "block-buffer" @@ -186,24 +186,24 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" [[package]] name = "bytes" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" +checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" [[package]] name = "capnp" -version = "0.21.7" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e92edec8974fcd7ece90bb021db782abe14a61c10c817f197f700fef7430eb8" +checksum = "bbffb6e69e1ea2cf518ac5037a78a223ecb82b4ac81e7ab33cb5211b43d712ac" dependencies = [ "embedded-io", ] [[package]] name = "capnp-futures" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d04478adeb234836f886ec554a0d96e3af3a939ba7b3962af5addddf7ab71231" +checksum = "a5ba7ae93ff689252798d8c71274512738ac2f3993da2adc961aa7441d2a27e6" dependencies = [ "capnp", "futures-channel", @@ -212,9 +212,9 @@ dependencies = [ [[package]] name = "capnp-rpc" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e9c19ef52ff1b9c9822fb21bfa68a72bc58711676295ff06eb88e64c7877f7" +checksum = "c263a9de8bfe8a151e30f6d32e620483dcdca4ed8fed6913be9bd9803cbd4e5e" dependencies = [ "capnp", "capnp-futures", @@ -223,18 +223,18 @@ dependencies = [ [[package]] name = "capnpc" -version = "0.21.4" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6da96dcb0a0e0c526daf42bac55e1550f18ad973df9ef9ba75204f332c80ad16" +checksum = "3f1cd4f042d6725da6245bde08c9e7c74f6fcb2d8bd5e0378e57991be8d711d8" dependencies = [ "capnp", ] [[package]] name = "cc" -version = "1.2.45" +version = "1.2.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35900b6c8d709fb1d854671ae27aeaa9eec2f8b01b364e1619a40da3e6fe2afe" +checksum = "b97463e1064cb1b1c1384ad0a0b9c8abd0988e2a91f52606c80ef14aadb63e36" dependencies = [ "find-msvc-tools", "shlex", @@ -498,9 +498,9 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] name = "embedded-io" -version = "0.6.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" +checksum = "9eb1aa714776b75c7e67e1da744b81a129b3ff919c8712b5e1b32252c1f07cc7" [[package]] name = "equivalent" @@ -556,9 +556,9 @@ dependencies = [ [[package]] name = "find-msvc-tools" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127" +checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" [[package]] name = "fnv" @@ -802,9 +802,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1744436df46f0bde35af3eda22aeaba453aada65d8f1c171cd8a5f59030bd69f" +checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" dependencies = [ "atomic-waker", "bytes", @@ -838,9 +838,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8" +checksum = "52e9a2a24dc5c6821e71a7030e1e14b7b632acac55c40e9d2e082c621261bb56" dependencies = [ "bytes", "futures-channel", @@ -897,7 +897,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", "inotify-sys", "libc", ] @@ -940,9 +940,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "js-sys" -version = "0.3.77" +version = "0.3.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65" dependencies = [ "once_cell", "wasm-bindgen", @@ -976,9 +976,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.175" +version = "0.2.177" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" +checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" [[package]] name = "libsystemd" @@ -1108,7 +1108,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", "cfg-if", "cfg_aliases", "libc", @@ -1121,7 +1121,7 @@ version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", "cfg-if", "cfg_aliases", "libc", @@ -1143,7 +1143,7 @@ version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", "inotify", "kqueue", "libc", @@ -1464,7 +1464,7 @@ version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", ] [[package]] @@ -1473,7 +1473,7 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", "errno", "libc", "linux-raw-sys", @@ -1830,9 +1830,9 @@ dependencies = [ [[package]] name = "tokio-seqpacket" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eb09d9a154bede1fafb3a9b13f4347de87e1ec07fa6fb42f52041800f18fe06" +checksum = "ab144b76e4ffb1d1a4e8b404073c922a243baebcc580cd75f415ae3ae9e42add" dependencies = [ "filedesc", "libc", @@ -1938,7 +1938,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" dependencies = [ - "bitflags 2.9.1", + "bitflags 2.10.0", "bytes", "http", "http-body", @@ -2184,35 +2184,22 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.100" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60" dependencies = [ "cfg-if", "once_cell", "rustversion", "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" -dependencies = [ - "bumpalo", - "log", - "proc-macro2", - "quote", - "syn", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.100" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2220,22 +2207,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.100" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc" dependencies = [ + "bumpalo", "proc-macro2", "quote", "syn", - "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.100" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76" dependencies = [ "unicode-ident", ] diff --git a/conmon-rs/client/Cargo.toml b/conmon-rs/client/Cargo.toml index 4678a8491f..b5feb69e0c 100644 --- a/conmon-rs/client/Cargo.toml +++ b/conmon-rs/client/Cargo.toml @@ -4,8 +4,8 @@ version = "0.7.1" edition = "2024" [dependencies] -capnp = { version = "0.21.7", default-features = false } -capnp-rpc = { version = "0.21.0", default-features = false } +capnp = { version = "0.23.0", default-features = false } +capnp-rpc = { version = "0.23.0", default-features = false } conmon-common = { path = "../common" } futures = { version = "0.3.31", default-features = false } log = { version = "0.4.28", default-features = false, features = ["serde", "std"] } diff --git a/conmon-rs/common/Cargo.toml b/conmon-rs/common/Cargo.toml index 89d6a195e3..abc25f838d 100644 --- a/conmon-rs/common/Cargo.toml +++ b/conmon-rs/common/Cargo.toml @@ -5,8 +5,8 @@ version = "0.7.1" edition = "2024" [dependencies] -capnp = "0.21.7" +capnp = "0.23.0" [build-dependencies] -capnp = { version = "0.21.7", default-features = false } -capnpc = { version = "0.21.4", default-features = false } +capnp = { version = "0.23.0", default-features = false } +capnpc = { version = "0.23.2", default-features = false } diff --git a/conmon-rs/server/Cargo.toml b/conmon-rs/server/Cargo.toml index 37b426fd07..6217110902 100644 --- a/conmon-rs/server/Cargo.toml +++ b/conmon-rs/server/Cargo.toml @@ -11,8 +11,8 @@ path = "src/main.rs" anyhow = { version = "1.0.100", default-features = false } async-channel = { version = "2.5.0", default-features = false, features = ["std"] } axum = { version = "0.8.6", default-features = false, features = ["http2", "tokio", "ws"] } -capnp = { version = "0.21.7", default-features = false } -capnp-rpc = { version = "0.21.0", default-features = false } +capnp = { version = "0.23.0", default-features = false } +capnp-rpc = { version = "0.23.0", default-features = false } clap = { version = "4.5.51", default-features = false, features = ["color", "cargo", "deprecated", "derive", "deprecated", "env", "error-context", "help", "std", "string", "suggestions", "unicode", "usage", "wrap_help"] } command-fds = { version = "0.3.2", default-features = false, features = ["tokio"] } conmon-common = { path = "../common" } diff --git a/conmon-rs/server/src/rpc.rs b/conmon-rs/server/src/rpc.rs index af84fe2d78..9d26646c2e 100644 --- a/conmon-rs/server/src/rpc.rs +++ b/conmon-rs/server/src/rpc.rs @@ -72,10 +72,11 @@ macro_rules! capnp_vec_path { }; } +#[allow(refining_impl_trait_reachable)] impl conmon::Server for Server { /// Retrieve version information from the server. fn version( - &mut self, + self: std::rc::Rc, params: conmon::VersionParams, mut results: conmon::VersionResults, ) -> Promise<(), capnp::Error> { @@ -103,7 +104,7 @@ impl conmon::Server for Server { /// Create a new container for the provided parameters. fn create_container( - &mut self, + self: std::rc::Rc, params: conmon::CreateContainerParams, mut results: conmon::CreateContainerResults, ) -> Promise<(), capnp::Error> { @@ -204,7 +205,7 @@ impl conmon::Server for Server { /// Execute a command in sync inside of a container. fn exec_sync_container( - &mut self, + self: std::rc::Rc, params: conmon::ExecSyncContainerParams, mut results: conmon::ExecSyncContainerResults, ) -> Promise<(), capnp::Error> { @@ -306,7 +307,7 @@ impl conmon::Server for Server { /// Attach to a running container. fn attach_container( - &mut self, + self: std::rc::Rc, params: conmon::AttachContainerParams, _: conmon::AttachContainerResults, ) -> Promise<(), capnp::Error> { @@ -345,7 +346,7 @@ impl conmon::Server for Server { /// Rotate all log drivers for a running container. fn reopen_log_container( - &mut self, + self: std::rc::Rc, params: conmon::ReopenLogContainerParams, _: conmon::ReopenLogContainerResults, ) -> Promise<(), capnp::Error> { @@ -368,7 +369,7 @@ impl conmon::Server for Server { /// Adjust the window size of a container running inside of a terminal. fn set_window_size_container( - &mut self, + self: std::rc::Rc, params: conmon::SetWindowSizeContainerParams, _: conmon::SetWindowSizeContainerResults, ) -> Promise<(), capnp::Error> { @@ -393,7 +394,7 @@ impl conmon::Server for Server { /// Create a new set of namespaces. fn create_namespaces( - &mut self, + self: std::rc::Rc, params: conmon::CreateNamespacesParams, mut results: conmon::CreateNamespacesResults, ) -> Promise<(), capnp::Error> { @@ -436,7 +437,7 @@ impl conmon::Server for Server { } fn start_fd_socket( - &mut self, + self: std::rc::Rc, params: conmon::StartFdSocketParams, mut results: conmon::StartFdSocketResults, ) -> Promise<(), capnp::Error> { @@ -468,7 +469,7 @@ impl conmon::Server for Server { } fn serve_exec_container( - &mut self, + self: std::rc::Rc, params: conmon::ServeExecContainerParams, mut results: conmon::ServeExecContainerResults, ) -> Promise<(), capnp::Error> { @@ -536,7 +537,7 @@ impl conmon::Server for Server { } fn serve_attach_container( - &mut self, + self: std::rc::Rc, params: conmon::ServeAttachContainerParams, mut results: conmon::ServeAttachContainerResults, ) -> Promise<(), capnp::Error> { @@ -581,7 +582,7 @@ impl conmon::Server for Server { } fn serve_port_forward_container( - &mut self, + self: std::rc::Rc, params: conmon::ServePortForwardContainerParams, mut results: conmon::ServePortForwardContainerResults, ) -> Promise<(), capnp::Error> {