From 142ca2fef862d0650b2279b6436b3e7a49e58842 Mon Sep 17 00:00:00 2001
From: Michael Ilyin <milyin@gmail.com>
Date: Fri, 5 Apr 2024 18:22:54 +0200
Subject: [PATCH] resolve disabled in prelude

---
 zenoh-ext/src/publication_cache.rs   |  2 +-
 zenoh-ext/src/querying_subscriber.rs |  2 +-
 zenoh/src/api/liveliness.rs          |  1 +
 zenoh/src/api/queryable.rs           |  2 +-
 zenoh/src/prelude.rs                 | 12 ++++++------
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/zenoh-ext/src/publication_cache.rs b/zenoh-ext/src/publication_cache.rs
index 41766fa1fa..e1a974b6ff 100644
--- a/zenoh-ext/src/publication_cache.rs
+++ b/zenoh-ext/src/publication_cache.rs
@@ -20,7 +20,7 @@ use zenoh::prelude::r#async::*;
 use zenoh::queryable::{Query, Queryable};
 use zenoh::session::SessionRef;
 use zenoh::subscriber::FlumeSubscriber;
-use zenoh_core::{AsyncResolve, Resolvable, SyncResolve};
+use zenoh_core::{AsyncResolve, Resolvable, Resolve, SyncResolve};
 use zenoh_result::{bail, ZResult};
 use zenoh_util::core::ResolveFuture;
 
diff --git a/zenoh-ext/src/querying_subscriber.rs b/zenoh-ext/src/querying_subscriber.rs
index 6ad417f774..bdcab8f220 100644
--- a/zenoh-ext/src/querying_subscriber.rs
+++ b/zenoh-ext/src/querying_subscriber.rs
@@ -26,7 +26,7 @@ use zenoh::session::SessionRef;
 use zenoh::subscriber::{Reliability, Subscriber};
 use zenoh::time::{new_reception_timestamp, Timestamp};
 use zenoh::Result as ZResult;
-use zenoh_core::{zlock, AsyncResolve, Resolvable, SyncResolve};
+use zenoh_core::{zlock, AsyncResolve, Resolvable, Resolve, SyncResolve};
 
 use crate::ExtractSample;
 
diff --git a/zenoh/src/api/liveliness.rs b/zenoh/src/api/liveliness.rs
index 7fc830be3d..51ff59e5cc 100644
--- a/zenoh/src/api/liveliness.rs
+++ b/zenoh/src/api/liveliness.rs
@@ -40,6 +40,7 @@ use {
     zenoh_protocol::network::declare::subscriber::ext::SubscriberInfo,
     zenoh_protocol::network::request,
 };
+use {zenoh_core::Resolve};
 
 #[zenoh_macros::unstable]
 pub(crate) static PREFIX_LIVELINESS: &str = crate::net::routing::PREFIX_LIVELINESS;
diff --git a/zenoh/src/api/queryable.rs b/zenoh/src/api/queryable.rs
index e46dab3c49..37afb900aa 100644
--- a/zenoh/src/api/queryable.rs
+++ b/zenoh/src/api/queryable.rs
@@ -31,7 +31,7 @@ use std::future::Ready;
 use std::ops::Deref;
 use std::sync::Arc;
 use uhlc::Timestamp;
-use zenoh_core::{AsyncResolve, Resolvable, SyncResolve};
+use zenoh_core::{AsyncResolve, Resolvable, Resolve, SyncResolve};
 use zenoh_protocol::{
     core::{EntityId, WireExpr},
     network::{response, Mapping, RequestId, Response, ResponseFinal},
diff --git a/zenoh/src/prelude.rs b/zenoh/src/prelude.rs
index 6e27fc3d6d..d26c146d4c 100644
--- a/zenoh/src/prelude.rs
+++ b/zenoh/src/prelude.rs
@@ -25,12 +25,12 @@
 pub use common::*;
 pub(crate) mod common {
     // pub use crate::api::key_expr::{keyexpr, KeyExpr, OwnedKeyExpr};
-    pub use zenoh_buffers::{
-        buffer::{Buffer, SplitBuffer},
-        reader::HasReader,
-        writer::HasWriter,
-    };
-    pub use zenoh_core::Resolve;
+    // pub use zenoh_buffers::{
+    //     buffer::{Buffer, SplitBuffer},
+    //     reader::HasReader,
+    //     writer::HasWriter,
+    // };
+    // pub use zenoh_core::Resolve;
 
     pub use zenoh_protocol::core::{EndPoint, Locator, ZenohId};
     #[zenoh_macros::unstable]