make reliability feature unstable (eclipse-zenoh#1317)

* make reliability feature unstable

* clippy fix

Author: milyin

zenoh/src/api/session.rs

@@ -39,8 +39,7 @@ use zenoh_protocol::network::{
 use zenoh_protocol::{
     core::{
         key_expr::{keyexpr, OwnedKeyExpr},
-        AtomicExprId, CongestionControl, EntityId, ExprId, Parameters, Reliability, WireExpr,
-        EMPTY_EXPR_ID,
+        AtomicExprId, CongestionControl, EntityId, ExprId, Parameters, WireExpr, EMPTY_EXPR_ID,
     },
     network::{
         self,
@@ -102,6 +101,8 @@ use crate::net::{
     routing::dispatcher::face::Face,
     runtime::{Runtime, RuntimeBuilder},
 };
+#[cfg(feature = "unstable")]
+use crate::pubsub::Reliability;
 
 zconfigurable! {
     pub(crate) static ref API_DATA_RECEPTION_CHANNEL_SIZE: usize = 256;
@@ -377,6 +378,7 @@ impl<'s, 'a> SessionDeclarations<'s, 'a> for SessionRef<'a> {
         SubscriberBuilder {
             session: self.clone(),
             key_expr: TryIntoKeyExpr::try_into(key_expr).map_err(Into::into),
+            #[cfg(feature = "unstable")]
             reliability: Reliability::DEFAULT,
             origin: Locality::default(),
             handler: DefaultHandler::default(),
@@ -2035,6 +2037,7 @@ impl<'s> SessionDeclarations<'s, 'static> for Arc<Session> {
         SubscriberBuilder {
             session: SessionRef::Shared(self.clone()),
             key_expr: key_expr.try_into().map_err(Into::into),
+            #[cfg(feature = "unstable")]
             reliability: Reliability::DEFAULT,
             origin: Locality::default(),
             handler: DefaultHandler::default(),

zenoh/src/api/subscriber.rs

@@ -20,7 +20,7 @@ use std::{
 };
 
 use zenoh_core::{Resolvable, Wait};
-use zenoh_protocol::{core::Reliability, network::declare::subscriber::ext::SubscriberInfo};
+use zenoh_protocol::network::declare::subscriber::ext::SubscriberInfo;
 use zenoh_result::ZResult;
 #[cfg(feature = "unstable")]
 use {zenoh_config::wrappers::EntityGlobalId, zenoh_protocol::core::EntityGlobalIdProto};
@@ -32,6 +32,8 @@ use super::{
     session::{SessionRef, UndeclarableSealed},
     Id,
 };
+#[cfg(feature = "unstable")]
+use crate::pubsub::Reliability;
 
 pub(crate) struct SubscriberState {
     pub(crate) id: Id,
@@ -200,8 +202,6 @@ pub struct SubscriberBuilder<'a, 'b, Handler> {
 
     #[cfg(feature = "unstable")]
     pub reliability: Reliability,
-    #[cfg(not(feature = "unstable"))]
-    pub(crate) reliability: Reliability,
 
     #[cfg(feature = "unstable")]
     pub origin: Locality,
@@ -239,16 +239,16 @@ impl<'a, 'b> SubscriberBuilder<'a, 'b, DefaultHandler> {
         let SubscriberBuilder {
             session,
             key_expr,
+            #[cfg(feature = "unstable")]
             reliability,
-
             origin,
             handler: _,
         } = self;
         SubscriberBuilder {
             session,
             key_expr,
+            #[cfg(feature = "unstable")]
             reliability,
-
             origin,
             handler: callback,
         }
@@ -312,13 +312,15 @@ impl<'a, 'b> SubscriberBuilder<'a, 'b, DefaultHandler> {
         let SubscriberBuilder {
             session,
             key_expr,
+            #[cfg(feature = "unstable")]
             reliability,
             origin,
             handler: _,
         } = self;
         SubscriberBuilder {
             session,
             key_expr,
+            #[cfg(feature = "unstable")]
             reliability,
             origin,
             handler,
@@ -329,20 +331,23 @@ impl<'a, 'b> SubscriberBuilder<'a, 'b, DefaultHandler> {
 impl<'a, 'b, Handler> SubscriberBuilder<'a, 'b, Handler> {
     /// Change the subscription reliability.
     #[inline]
+    #[zenoh_macros::unstable]
     pub fn reliability(mut self, reliability: Reliability) -> Self {
         self.reliability = reliability;
         self
     }
 
     /// Change the subscription reliability to `Reliable`.
     #[inline]
+    #[zenoh_macros::unstable]
     pub fn reliable(mut self) -> Self {
         self.reliability = Reliability::Reliable;
         self
     }
 
     /// Change the subscription reliability to `BestEffort`.
     #[inline]
+    #[zenoh_macros::unstable]
     pub fn best_effort(mut self) -> Self {
         self.reliability = Reliability::BestEffort;
         self
@@ -381,9 +386,12 @@ where
                 &key_expr,
                 self.origin,
                 callback,
+                #[cfg(feature = "unstable")]
                 &SubscriberInfo {
                     reliability: self.reliability,
                 },
+                #[cfg(not(feature = "unstable"))]
+                &SubscriberInfo::default(),
             )
             .map(|sub_state| Subscriber {
                 subscriber: SubscriberInner {

zenoh/src/lib.rs

@@ -230,6 +230,7 @@ pub mod bytes {
 
 /// Pub/sub primitives
 pub mod pubsub {
+    #[zenoh_macros::unstable]
     pub use zenoh_protocol::core::Reliability;
 
     #[zenoh_macros::unstable]

zenoh/tests/session.rs

@@ -21,11 +21,14 @@ use std::{
 
 #[cfg(feature = "internal")]
 use zenoh::internal::runtime::{Runtime, RuntimeBuilder};
+#[cfg(feature = "unstable")]
+use zenoh::pubsub::Reliability;
 use zenoh::{
-    config, key_expr::KeyExpr, prelude::*, pubsub::Reliability, qos::CongestionControl,
-    sample::SampleKind, Session,
+    config, key_expr::KeyExpr, prelude::*, qos::CongestionControl, sample::SampleKind, Session,
 };
 use zenoh_core::ztimeout;
+#[cfg(not(feature = "unstable"))]
+use zenoh_protocol::core::Reliability;
 
 const TIMEOUT: Duration = Duration::from_secs(60);
 const SLEEP: Duration = Duration::from_secs(1);