Try to fix Module reorganization

https://zenoh.io/docs/migration_1.0/rust/#module-reorganization
biyooon-ex · Nov 8, 2024 · e242f6f · e242f6f
1 parent 484155d
commit e242f6f
Show file tree

Hide file tree

Showing 9 changed files with 322 additions and 135 deletions.
diff --git a/mix_compile.log b/mix_compile.log
diff --git a/native/zenohex_nif/src/lib.rs b/native/zenohex_nif/src/lib.rs
@@ -2,10 +2,10 @@ use std::sync::{Arc, RwLock};
 
 use flume::Receiver;
 use rustler::{Env, Resource, ResourceArc, Term};
-use zenoh::{
-    prelude::sync::*, publication::Publisher, query::Reply, queryable::Query, queryable::Queryable,
-    sample::Sample, subscriber::PullSubscriber, subscriber::Subscriber, Session,
-};
+use zenoh::session::Session;
+use zenoh::pubsub::{Publisher, Subscriber};
+use zenoh::query::{Reply, Query, Queryable};
+use zenoh::sample::Sample;
 
 mod atoms {
     rustler::atoms! {

diff --git a/native/zenohex_nif/src/publisher.rs b/native/zenohex_nif/src/publisher.rs
@@ -1,6 +1,6 @@
 use crate::PublisherRef;
 use rustler::{types::atom, Binary, Encoder, Env, ResourceArc, Term};
-use zenoh::{prelude::sync::SyncResolve, publication::Publisher, value::Value};
+use zenoh::{pubsub::Publisher, bytes::ZBytes};
 
 #[rustler::nif]
 fn publisher_put_integer(env: Env, resource: ResourceArc<PublisherRef>, value: i64) -> Term {

diff --git a/native/zenohex_nif/src/pull_subscriber.rs b/native/zenohex_nif/src/pull_subscriber.rs
@@ -2,7 +2,7 @@ use std::time::Duration;
 
 use flume::{Receiver, RecvTimeoutError};
 use rustler::{types::atom, Encoder, Env, ResourceArc, Term};
-use zenoh::{prelude::sync::SyncResolve, sample::Sample, subscriber::PullSubscriber};
+use zenoh::{sample::Sample, subscriber::PullSubscriber};
 
 #[rustler::nif(schedule = "DirtyIo")]
 fn pull_subscriber_recv_timeout(

diff --git a/native/zenohex_nif/src/query.rs b/native/zenohex_nif/src/query.rs
@@ -1,7 +1,6 @@
 use std::sync::RwLock;
 
 use rustler::{types::atom, Encoder, Env, ErlOption, ResourceArc, Term};
-use zenoh::prelude::sync::SyncResolve;
 
 use crate::{QueryRef, SampleRef};
 

diff --git a/native/zenohex_nif/src/queryable.rs b/native/zenohex_nif/src/queryable.rs
@@ -2,7 +2,7 @@ use std::time::Duration;
 
 use flume::{Receiver, RecvTimeoutError};
 use rustler::{Encoder, Env, ResourceArc, Term};
-use zenoh::queryable::{Query, Queryable};
+use zenoh::query::{Query, Queryable};
 
 use crate::{atoms, QueryableRef};
 

diff --git a/native/zenohex_nif/src/session.rs b/native/zenohex_nif/src/session.rs
@@ -2,7 +2,7 @@ use std::{sync::Arc, time::Duration};
 
 use flume::{Receiver, RecvTimeoutError};
 use rustler::{types::atom, Binary, Encoder, Env, ResourceArc, Term};
-use zenoh::{prelude::sync::*, query::Reply, value::Value, Session};
+use zenoh::{query::Reply, bytes::ZBytes, session::Session};
 
 #[rustler::nif]
 fn declare_publisher(

diff --git a/native/zenohex_nif/src/subscriber.rs b/native/zenohex_nif/src/subscriber.rs
@@ -2,7 +2,7 @@ use std::time::Duration;
 
 use flume::{Receiver, RecvTimeoutError};
 use rustler::{Encoder, Env, ResourceArc, Term};
-use zenoh::{sample::Sample, subscriber::Subscriber};
+use zenoh::{sample::Sample, pubsub::Subscriber};
 
 #[rustler::nif(schedule = "DirtyIo")]
 fn subscriber_recv_timeout(

diff --git a/native/zenohex_nif/src/value.rs b/native/zenohex_nif/src/value.rs
@@ -1,7 +1,7 @@
 use std::{borrow::Cow, io::Write};
 
 use rustler::{Encoder, Env, OwnedBinary, Term};
-use zenoh::prelude::KnownEncoding;
+// use zenoh::prelude::KnownEncoding;
 
 pub(crate) struct ExValue;