Rename Face functions to match Primitives trait

eclipse-zenoh · Feb 26, 2021 · b9fc618 · b9fc618
1 parent 4748b39
commit b9fc618
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/zenoh/src/net/protocol/session/primitives/demux.rs b/zenoh/src/net/protocol/session/primitives/demux.rs
@@ -128,7 +128,7 @@ impl DeMux {
                 ..
             }) => {
                 self.primitives
-                    .query(
+                    .send_query(
                         &key,
                         &predicate,
                         qid,
@@ -146,7 +146,7 @@ impl DeMux {
                 ..
             }) => {
                 self.primitives
-                    .pull(
+                    .send_pull(
                         zmsg::has_flag(msg.header, zmsg::flag::F),
                         &key,
                         pull_id,
@@ -166,7 +166,7 @@ impl DeMux {
     pub async fn del_link(&self, _link: Link) {}
 
     pub async fn closing(&self) {
-        self.primitives.close().await;
+        self.primitives.send_close().await;
     }
 
     pub async fn closed(&self) {}

diff --git a/zenoh/src/net/routing/face.rs b/zenoh/src/net/routing/face.rs
@@ -505,7 +505,7 @@ impl Face {
         .await;
     }
 
-    pub(crate) async fn query(
+    pub(crate) async fn send_query(
         &self,
         reskey: &ResKey,
         predicate: &str,
@@ -558,7 +558,7 @@ impl Face {
         route_send_reply_final(&mut tables, &mut self.state.clone(), qid).await;
     }
 
-    pub(crate) async fn pull(
+    pub(crate) async fn send_pull(
         &self,
         is_final: bool,
         reskey: &ResKey,
@@ -579,7 +579,7 @@ impl Face {
         .await;
     }
 
-    pub(crate) async fn close(&self) {
+    pub(crate) async fn send_close(&self) {
         self.tables
             .write()
             .await

diff --git a/zenoh/src/net/session.rs b/zenoh/src/net/session.rs
@@ -269,7 +269,7 @@ impl Session {
             .as_ref()
             .unwrap()
             .clone();
-        primitives.close().await;
+        primitives.send_close().await;
 
         Ok(())
     }
@@ -998,7 +998,7 @@ impl Session {
         let state = self.state.read().await;
         let primitives = state.primitives.as_ref().unwrap().clone();
         drop(state);
-        primitives.pull(true, reskey, 0, &None).await;
+        primitives.send_pull(true, reskey, 0, &None).await;
         Ok(())
     }
 
@@ -1064,7 +1064,7 @@ impl Session {
         let local_routing = state.local_routing;
         drop(state);
         primitives
-            .query(
+            .send_query(
                 resource,
                 predicate,
                 qid,