Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync lockfile with Zenoh 3740564 from 2024-10-08 #175

Merged
merged 1 commit into from
Oct 8, 2024
Merged

Sync lockfile with Zenoh 3740564 from 2024-10-08 #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions zenoh-plugin-ros1/src/ros_to_zenoh_bridge/aloha_subscription.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@ use std::{
time::Duration,
};

use flume::Receiver;
use futures::{join, Future, FutureExt};
use tokio::sync::Mutex;
use tracing::error;
use zenoh::{key_expr::OwnedKeyExpr, sample::Sample, Result as ZResult, Session};
use zenoh::{
handlers::FifoChannelHandler, key_expr::OwnedKeyExpr, sample::Sample, Result as ZResult,
Session,
};

use crate::spawn_runtime;

Expand Down Expand Up @@ -136,7 +138,7 @@ impl AlohaSubscription {
async fn listening_task<'a, F>(
task_running: Arc<AtomicBool>,
accumulating_resources: &Mutex<HashMap<OwnedKeyExpr, AlohaResource>>,
subscriber: &'a zenoh::pubsub::Subscriber<Receiver<Sample>>,
subscriber: &'a zenoh::pubsub::Subscriber<FifoChannelHandler<Sample>>,
on_resource_declared: &F,
) where
F: Fn(zenoh::key_expr::KeyExpr) -> Box<dyn futures::Future<Output = ()> + Unpin + Send>
Expand Down
3 changes: 2 additions & 1 deletion zenoh-plugin-ros1/src/ros_to_zenoh_bridge/test_helpers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ use futures::Future;
use rosrust::{Client, RawMessage, RawMessageDescription};
use tracing::error;
use zenoh::{
handlers::FifoChannelHandler,
internal::{bail, zlock},
key_expr::OwnedKeyExpr,
sample::Sample,
Expand Down Expand Up @@ -360,7 +361,7 @@ impl BridgeChecker {
&self,
name: &str,
data: Vec<u8>,
) -> flume::Receiver<zenoh::query::Reply> {
) -> FifoChannelHandler<zenoh::query::Reply> {
self.zenoh_client
.make_query_sync(Self::make_zenoh_key(&Self::make_topic(name)), data)
.await
Expand Down
3 changes: 2 additions & 1 deletion zenoh-plugin-ros1/src/ros_to_zenoh_bridge/zenoh_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ use std::fmt::Display;

use tracing::debug;
use zenoh::{
handlers::FifoChannelHandler,
key_expr::KeyExpr,
qos::{CongestionControl, Reliability},
query::Selector,
Expand Down Expand Up @@ -117,7 +118,7 @@ impl ZenohClient {
&self,
selector: IntoSelector,
data: Vec<u8>,
) -> ZResult<flume::Receiver<zenoh::query::Reply>>
) -> ZResult<FifoChannelHandler<zenoh::query::Reply>>
where
IntoSelector: TryInto<Selector<'b>> + Display,
<IntoSelector as TryInto<Selector<'b>>>::Error: Into<zenoh::Error>,
Expand Down