Cleanup QueryTarget

commons/zenoh-protocol/src/core/mod.rs

@@ -359,18 +359,3 @@ pub enum CongestionControl {
 impl CongestionControl {
     pub const DEFAULT: Self = Self::Drop;
 }
-
-/// The `zenoh::queryable::Queryable`s that should be target of a `zenoh::Session::get()`.
-#[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
-pub enum QueryTarget {
-    #[default]
-    BestMatching,
-    All,
-    AllComplete,
-    #[cfg(feature = "complete_n")]
-    Complete(u64),
-}
-
-impl QueryTarget {
-    pub const DEFAULT: Self = Self::BestMatching;
-}

commons/zenoh-protocol/src/network/request.rs

@@ -66,7 +66,6 @@ pub struct Request {
 pub mod ext {
     use crate::{
         common::{ZExtZ64, ZExtZBuf},
-        core::QueryTarget,
         zextz64, zextzbuf,
     };
     use core::{num::NonZeroU32, time::Duration};
@@ -88,9 +87,19 @@ pub mod ext {
     /// +---------------+
     ///
     /// The `zenoh::queryable::Queryable`s that should be target of a `zenoh::Session::get()`.
-    pub type TargetType = QueryTarget;
+    #[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
+    pub enum TargetType {
+        #[default]
+        BestMatching,
+        All,
+        AllComplete,
+        #[cfg(feature = "complete_n")]
+        Complete(u64),
+    }
 
     impl TargetType {
+        pub const DEFAULT: Self = Self::BestMatching;
+
         #[cfg(feature = "test")]
         pub fn rand() -> Self {
             use rand::prelude::*;

zenoh/src/query.rs

@@ -27,7 +27,7 @@ use zenoh_protocol::zenoh::query::Consolidation;
 use zenoh_result::ZResult;
 
 /// The [`Queryable`](crate::queryable::Queryable)s that should be target of a [`get`](Session::get).
-pub use zenoh_protocol::core::QueryTarget;
+pub type QueryTarget = zenoh_protocol::network::request::ext::TargetType;
 
 /// The kind of consolidation.
 #[derive(Debug, Clone, PartialEq, Eq, Copy)]