From a3f7533c57c6693fb906e52afdf13cbf8416d054 Mon Sep 17 00:00:00 2001 From: Mahmoud Mazouz Date: Tue, 8 Oct 2024 14:25:04 +0000 Subject: [PATCH] Sync lockfile with Zenoh `e9f3b37` from `2024-10-08` --- Cargo.lock | 52 ++++++++++++++++++++++++------------------------- src/handlers.rs | 41 +++++++++++++++++++++++--------------- 2 files changed, 51 insertions(+), 42 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5f8ac5d..c3cc0fb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2741,7 +2741,7 @@ dependencies = [ [[package]] name = "zenoh" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" dependencies = [ "ahash", "async-trait", @@ -2790,7 +2790,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" dependencies = [ "zenoh-collections", ] @@ -2798,7 +2798,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" dependencies = [ "tracing", "uhlc", @@ -2809,12 +2809,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" [[package]] name = "zenoh-config" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" dependencies = [ "json5", "num_cpus", @@ -2835,7 +2835,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" dependencies = [ "lazy_static", "tokio", @@ -2846,7 +2846,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" dependencies = [ "aes", "hmac", @@ -2859,7 +2859,7 @@ dependencies = [ [[package]] name = "zenoh-ext" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" dependencies = [ "bincode", "flume", @@ -2876,7 +2876,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" dependencies = [ "hashbrown", "keyed-set", @@ -2890,7 +2890,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" dependencies = [ "zenoh-config", "zenoh-link-commons", @@ -2907,7 +2907,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" dependencies = [ "async-trait", "flume", @@ -2930,7 +2930,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" dependencies = [ "async-trait", "base64 0.22.1", @@ -2955,7 +2955,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" dependencies = [ "async-trait", "socket2", @@ -2972,7 +2972,7 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" dependencies = [ "async-trait", "base64 0.22.1", @@ -2999,7 +2999,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" dependencies = [ "async-trait", "socket2", @@ -3018,7 +3018,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" dependencies = [ "async-trait", "nix", @@ -3036,7 +3036,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" dependencies = [ "async-trait", "futures-util", @@ -3056,7 +3056,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" dependencies = [ "proc-macro2", "quote", @@ -3067,7 +3067,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" dependencies = [ "git-version", "libloading", @@ -3083,7 +3083,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" dependencies = [ "const_format", "rand", @@ -3110,7 +3110,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" dependencies = [ "anyhow", ] @@ -3118,7 +3118,7 @@ dependencies = [ [[package]] name = "zenoh-runtime" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" dependencies = [ "lazy_static", "ron", @@ -3131,7 +3131,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" dependencies = [ "event-listener", "futures", @@ -3144,7 +3144,7 @@ dependencies = [ [[package]] name = "zenoh-task" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" dependencies = [ "futures", "tokio", @@ -3157,7 +3157,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" dependencies = [ "async-trait", "crossbeam-utils", @@ -3190,7 +3190,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699" dependencies = [ "async-trait", "const_format", diff --git a/src/handlers.rs b/src/handlers.rs index cf59887..716add2 100644 --- a/src/handlers.rs +++ b/src/handlers.rs @@ -280,6 +280,19 @@ fn recv( } } +enum DeadlineError { + Timeout, + Error(E), +} +impl fmt::Display for DeadlineError { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + match self { + Self::Error(err) => write!(f, "{err}"), + Self::Timeout => unreachable!(), + } + } +} + impl Receiver for RustHandler where T::Into: IntoPython, @@ -295,8 +308,12 @@ where fn recv(&self, py: Python) -> PyResult { recv( py, - || self.handler.recv_timeout(CHECK_SIGNALS_INTERVAL), - |err| matches!(err, flume::RecvTimeoutError::Timeout), + || match self.handler.recv_timeout(CHECK_SIGNALS_INTERVAL) { + Ok(Some(x)) => Ok(x), + Ok(None) => Err(DeadlineError::Timeout), + Err(err) => Err(DeadlineError::Error(err)), + }, + |err| matches!(err, DeadlineError::Timeout), ) } } @@ -316,8 +333,12 @@ where fn recv(&self, py: Python) -> PyResult { recv( py, - || self.handler.recv_timeout(CHECK_SIGNALS_INTERVAL), - |err| matches!(err, flume::RecvTimeoutError::Timeout), + || match self.handler.recv_timeout(CHECK_SIGNALS_INTERVAL) { + Ok(Some(x)) => Ok(x), + Ok(None) => Err(DeadlineError::Timeout), + Err(err) => Err(DeadlineError::Error(err)), + }, + |err| matches!(err, DeadlineError::Timeout), ) } } @@ -335,18 +356,6 @@ where } fn recv(&self, py: Python) -> PyResult { - enum DeadlineError { - Timeout, - Error(E), - } - impl fmt::Display for DeadlineError { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - match self { - Self::Error(err) => write!(f, "{err}"), - Self::Timeout => unreachable!(), - } - } - } recv( py, || match self.handler.recv_timeout(CHECK_SIGNALS_INTERVAL) {