Merge branch 'main' into api/make-replier-id-global

Author: oteffahi

src/macros.rs

@@ -86,7 +86,7 @@ macro_rules! downcast_or_new {
 pub(crate) use downcast_or_new;
 
 macro_rules! enum_mapper {
-    ($($path:ident)::*: $repr:ty { $($variant:ident $(= $discriminator:literal)?),* $(,)? }) => {
+    ($($path:ident)::*: $repr:ty { $($variant:ident $(= $discriminator:literal)?,)* }) => {
         $crate::macros::enum_mapper!(@ $($path)::*, $($path)::*: $repr { $($variant $(= $discriminator)?,)* });
     };
     (@ $ty:ident::$($tt:ident)::*, $path:path: $repr:ty { $($variant:ident $(= $discriminator:literal)?,)* }) => {

src/qos.rs

@@ -40,6 +40,7 @@ impl Priority {
 enum_mapper!(zenoh::qos::CongestionControl: u8 {
     Drop = 0,
     Block = 1,
+    BlockFirst = 2,
 });
 
 #[pymethods]
@@ -50,7 +51,7 @@ impl CongestionControl {
 
 enum_mapper!(zenoh::qos::Reliability: u8 {
     BestEffort,
-    Reliable
+    Reliable,
 });
 
 #[pymethods]

zenoh/__init__.pyi

@@ -57,6 +57,7 @@ class CongestionControl(Enum):
 
     DROP = auto()
     BLOCK = auto()
+    BLOCK_FIRST = _unstable(auto())
 
     DEFAULT = DROP