Align Rust with Reliability exported in zenoh::qos (#335)

* Align Rust with Reliability exported in zenoh::qos * Align with Zenoh
eclipse-zenoh · Sep 19, 2024 · f3d8983 · f3d8983
1 parent 89308fc
commit f3d8983
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 58 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/lib.rs b/src/lib.rs
@@ -57,8 +57,8 @@ pub(crate) mod zenoh {
         config::{Config, WhatAmI, WhatAmIMatcher, ZenohId},
         handlers::Handler,
         key_expr::{KeyExpr, SetIntersectionLevel},
-        pubsub::{Publisher, Reliability, Subscriber},
-        qos::{CongestionControl, Priority},
+        pubsub::{Publisher, Subscriber},
+        qos::{CongestionControl, Priority, Reliability},
         query::{
             ConsolidationMode, Parameters, Query, QueryConsolidation, QueryTarget, Queryable,
             Reply, ReplyError, Selector,

diff --git a/src/pubsub.rs b/src/pubsub.rs
@@ -20,8 +20,8 @@ use crate::{
     bytes::{Encoding, ZBytes},
     handlers::HandlerImpl,
     key_expr::KeyExpr,
-    macros::{build, enum_mapper, option_wrapper},
-    qos::{CongestionControl, Priority},
+    macros::{build, option_wrapper},
+    qos::{CongestionControl, Priority, Reliability},
     sample::Sample,
     utils::{generic, wait},
 };
@@ -101,17 +101,6 @@ impl Publisher {
     }
 }
 
-enum_mapper!(zenoh::pubsub::Reliability: u8 {
-    BestEffort,
-    Reliable
-});
-
-#[pymethods]
-impl Reliability {
-    #[classattr]
-    const DEFAULT: Self = Self::BestEffort;
-}
-
 option_wrapper!(
     zenoh::pubsub::Subscriber<HandlerImpl<Sample>>,
     "Undeclared subscriber"

diff --git a/src/qos.rs b/src/qos.rs
@@ -47,3 +47,14 @@ impl CongestionControl {
     #[classattr]
     const DEFAULT: Self = Self::Drop;
 }
+
+enum_mapper!(zenoh::qos::Reliability: u8 {
+    BestEffort,
+    Reliable
+});
+
+#[pymethods]
+impl Reliability {
+    #[classattr]
+    const DEFAULT: Self = Self::BestEffort;
+}
diff --git a/src/session.rs b/src/session.rs
@@ -26,8 +26,8 @@ use crate::{
     handlers::{into_handler, HandlerImpl},
     key_expr::KeyExpr,
     macros::{build, with, wrapper},
-    pubsub::{Publisher, Reliability, Subscriber},
-    qos::{CongestionControl, Priority},
+    pubsub::{Publisher, Subscriber},
+    qos::{CongestionControl, Priority, Reliability},
     query::{QueryConsolidation, QueryTarget, Queryable, Reply, Selector},
     time::Timestamp,
     utils::{wait, IntoPython, MapInto},