unfinished

eclipse-zenoh · Apr 1, 2024 · 7d02e04 · 7d02e04
1 parent 71e7ebf
commit 7d02e04
Show file tree

Hide file tree

Showing 12 changed files with 60 additions and 550 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/zenoh/src/api.rs b/zenoh/src/api.rs
@@ -30,6 +30,6 @@ pub mod queryable;
 pub mod sample;
 mod scouting;
 pub mod selector;
-mod subscriber;
+pub mod subscriber;
 mod time;
 pub mod value;
diff --git a/zenoh/src/api/key_expr.rs b/zenoh/src/api/key_expr.rs
@@ -54,7 +54,7 @@ use std::{
     str::FromStr,
 };
 use zenoh_core::{AsyncResolve, Resolvable, SyncResolve};
-use zenoh_keyexpr::{keyexpr, OwnedKemtExpr};
+use zenoh_keyexpr::{keyexpr, OwnedKeyExpr};
 use zenoh_protocol::{
     core::{key_expr::canon::Canonizable, ExprId, WireExpr},
     network::{declare, DeclareBody, Mapping, UndeclareKeyExpr},

diff --git a/zenoh/src/api/publication.rs b/zenoh/src/api/publication.rs
@@ -13,18 +13,14 @@
 //
 
 //! Publishing primitives.
-<<<<<<< HEAD:zenoh/src/api/publication.rs
-=======
-use crate::net::primitives::Primitives;
-use crate::prelude::*;
->>>>>>> sample_api_rework:zenoh/src/publication.rs
 #[zenoh_macros::unstable]
 use crate::api::sample::attachment::Attachment;
 #[zenoh_macros::unstable]
 use crate::api::sample::SourceInfo;
 use crate::api::{
     encoding::Encoding,
-    handlers::{locked, Callback, DefaultHandler, IntoHandler},
+    handlers::locked,
+    handlers::DefaultHandler,
     key_expr::{KeyExpr, KeyExprInner},
     payload::Payload,
     sample::{
@@ -33,24 +29,18 @@ use crate::api::{
     },
     session::{SessionRef, Undeclarable},
     value::Value,
-    Id,
 };
 use crate::net::primitives::Primitives;
 use std::future::Ready;
-use zenoh_core::{zread, AsyncResolve, Resolvable, Resolve, SyncResolve};
+use zenoh_core::{zread, AsyncResolve, Resolvable, Resolve, Result as ZResult, SyncResolve};
 use zenoh_keyexpr::keyexpr;
-use zenoh_protocol::core::EntityGlobalId;
-use zenoh_protocol::core::EntityId;
-use zenoh_protocol::network::push::ext;
-use zenoh_protocol::network::Mapping;
-use zenoh_protocol::network::Push;
-use zenoh_protocol::zenoh::Del;
-use zenoh_protocol::zenoh::PushBody;
-use zenoh_protocol::zenoh::Put;
-use zenoh_result::ZResult;
-
-/// The kind of congestion control.
-pub use zenoh_protocol::core::CongestionControl;
+use zenoh_protocol::{
+    core::CongestionControl,
+    network::Mapping,
+    zenoh::{Del, Put},
+};
+use zenoh_protocol::{core::EntityGlobalId, network::Push};
+use zenoh_protocol::{network::push::ext, zenoh::PushBody};
 
 #[derive(Debug, Clone)]
 pub struct PublicationBuilderPut {
@@ -246,6 +236,7 @@ use std::convert::TryFrom;
 use std::convert::TryInto;
 use std::pin::Pin;
 use std::task::{Context, Poll};
+use zenoh_protocol::core::EntityId;
 use zenoh_result::Error;
 
 #[zenoh_macros::unstable]

diff --git a/zenoh/src/api/query.rs b/zenoh/src/api/query.rs
@@ -13,11 +13,6 @@
 //
 
 //! Query primitives.
-<<<<<<< HEAD:zenoh/src/api/query.rs
-=======
-use crate::handlers::{locked, Callback, DefaultHandler};
-use crate::prelude::*;
->>>>>>> sample_api_rework:zenoh/src/query.rs
 #[zenoh_macros::unstable]
 use crate::api::sample::SourceInfo;
 use crate::api::{

diff --git a/zenoh/src/api/queryable.rs b/zenoh/src/api/queryable.rs
@@ -13,7 +13,6 @@
 //
 
 //! Queryable primitives.
-<<<<<<< HEAD:zenoh/src/api/queryable.rs
 #[zenoh_macros::unstable]
 use crate::api::query::ReplyKeyExpr;
 #[zenoh_macros::unstable]
@@ -27,8 +26,8 @@ use crate::api::{
     sample::{
         attachment::Attachment,
         builder::{
-            DeleteSampleBuilder, PutSampleBuilder, QoSBuilderTrait, SampleBuilder,
-            SampleBuilderTrait, TimestampBuilderTrait, ValueBuilderTrait,
+            QoSBuilderTrait, SampleBuilder, SampleBuilderTrait, TimestampBuilderTrait,
+            ValueBuilderTrait,
         },
         Locality, Sample, SampleKind,
     },
@@ -38,20 +37,6 @@ use crate::api::{
     Id,
 };
 use crate::net::primitives::Primitives;
-=======
-
-use crate::encoding::Encoding;
-use crate::handlers::{locked, DefaultHandler};
-use crate::net::primitives::Primitives;
-use crate::prelude::*;
-use crate::sample::builder::SampleBuilder;
-use crate::sample::{QoSBuilder, SourceInfo};
-use crate::Id;
-use crate::SessionRef;
-use crate::Undeclarable;
-#[cfg(feature = "unstable")]
-use crate::{query::ReplyKeyExpr, sample::Attachment};
->>>>>>> sample_api_rework:zenoh/src/queryable.rs
 use std::fmt;
 use std::future::Ready;
 use std::ops::Deref;
@@ -68,7 +53,7 @@ use zenoh_protocol::{
 };
 use zenoh_result::ZResult;
 
-use super::query::_REPLY_KEY_EXPR_ANY_SEL_PARAM;
+use super::{query::_REPLY_KEY_EXPR_ANY_SEL_PARAM, sample::QoSBuilder};
 
 pub(crate) struct QueryInner {
     /// The key expression of this Query.
@@ -176,6 +161,7 @@ impl Query {
                 encoding: Encoding::default(),
             },
             timestamp: None,
+            #[cfg(feature = "unstable")]
             source_info: SourceInfo::empty(),
             attachment: None,
         }
@@ -214,6 +200,7 @@ impl Query {
             qos: response::ext::QoSType::RESPONSE.into(),
             kind: ReplyBuilderDelete,
             timestamp: None,
+            #[cfg(feature = "unstable")]
             source_info: SourceInfo::empty(),
             attachment: None,
         }
@@ -283,8 +270,8 @@ impl AsyncResolve for ReplySample<'_> {
 
 #[derive(Debug)]
 pub struct ReplyBuilderPut {
-    payload: super::Payload,
-    encoding: super::Encoding,
+    payload: Payload,
+    encoding: Encoding,
 }
 #[derive(Debug)]
 pub struct ReplyBuilderDelete;