Sync lockfile with Zenoh e9f3b37 from 2024-10-08

eclipse-zenoh · Oct 8, 2024 · a0f7963 · a0f7963
1 parent 724d7fa
commit a0f7963
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 44 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -50,5 +50,10 @@ pyo3 = { version = "0.21.2", features = [
   "experimental-declarative-modules",
 ] }
 validated_struct = "2.1.0"
-zenoh = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = ["unstable", "internal"], default-features = false }
-zenoh-ext = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = ["internal"], optional = true }
+zenoh = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = [
+  "unstable",
+  "internal",
+], default-features = false }
+zenoh-ext = { version = "1.0.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = [
+  "internal",
+], optional = true }
diff --git a/src/handlers.rs b/src/handlers.rs
@@ -280,6 +280,19 @@ fn recv<T: IntoPython, E: IntoPyErr + Send>(
     }
 }
 
+enum DeadlineError<E> {
+    Timeout,
+    Error(E),
+}
+impl<E: fmt::Display> fmt::Display for DeadlineError<E> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::Error(err) => write!(f, "{err}"),
+            Self::Timeout => unreachable!(),
+        }
+    }
+}
+
 impl<T: IntoRust> Receiver for RustHandler<DefaultHandler, T>
 where
     T::Into: IntoPython,
@@ -295,8 +308,12 @@ where
     fn recv(&self, py: Python) -> PyResult<PyObject> {
         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<PyObject> {
         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<PyObject> {
-        enum DeadlineError<E> {
-            Timeout,
-            Error(E),
-        }
-        impl<E: fmt::Display> fmt::Display for DeadlineError<E> {
-            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) {