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

Reliability is exported in zenoh::qos #1457

Merged
merged 1 commit into from
Sep 19, 2024
Merged

Reliability is exported in zenoh::qos #1457

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
2 changes: 1 addition & 1 deletion zenoh-ext/src/querying_subscriber.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use std::{
};

#[cfg(feature = "unstable")]
use zenoh::pubsub::Reliability;
use zenoh::qos::Reliability;
use zenoh::{
handlers::{locked, Callback, DefaultHandler, IntoHandler},
internal::zlock,
Expand Down
7 changes: 4 additions & 3 deletions zenoh/src/api/subscriber.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ use tracing::error;
use zenoh_core::{Resolvable, Wait};
use zenoh_result::ZResult;
#[cfg(feature = "unstable")]
use {zenoh_config::wrappers::EntityGlobalId, zenoh_protocol::core::EntityGlobalIdProto};
use {
crate::qos::Reliability, zenoh_config::wrappers::EntityGlobalId,
zenoh_protocol::core::EntityGlobalIdProto,
};

#[cfg(feature = "unstable")]
use crate::pubsub::Reliability;
use crate::{
api::{
handlers::{locked, Callback, DefaultHandler, IntoHandler},
Expand Down
5 changes: 2 additions & 3 deletions zenoh/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,9 +228,6 @@ pub mod bytes {

/// Pub/sub primitives
pub mod pubsub {
#[zenoh_macros::unstable]
pub use zenoh_protocol::core::Reliability;

#[zenoh_macros::unstable]
pub use crate::api::publisher::{
MatchingListener, MatchingListenerBuilder, MatchingListenerUndeclaration, MatchingStatus,
Expand Down Expand Up @@ -276,6 +273,8 @@ pub mod handlers {
/// Quality of service primitives
pub mod qos {
pub use zenoh_protocol::core::CongestionControl;
#[zenoh_macros::unstable]
pub use zenoh_protocol::core::Reliability;

pub use crate::api::publisher::Priority;
}
Expand Down
2 changes: 1 addition & 1 deletion zenoh/tests/session.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ use std::{
#[cfg(feature = "internal")]
use zenoh::internal::runtime::{Runtime, RuntimeBuilder};
#[cfg(feature = "unstable")]
use zenoh::pubsub::Reliability;
use zenoh::qos::Reliability;
use zenoh::{key_expr::KeyExpr, qos::CongestionControl, sample::SampleKind, Session};
use zenoh_core::ztimeout;
#[cfg(not(feature = "unstable"))]
Expand Down
3 changes: 1 addition & 2 deletions zenoh/tests/shm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ use std::{
};

use zenoh::{
pubsub::Reliability,
qos::CongestionControl,
qos::{CongestionControl, Reliability},
shm::{
zshm, BlockOn, GarbageCollect, PosixShmProviderBackend, ShmProviderBuilder,
POSIX_PROTOCOL_ID,
Expand Down