Remove remaining deprecated APIs

eclipse-zenoh · Sep 20, 2024 · 4e058de · 4e058de
1 parent 94ba6f3
commit 4e058de
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 91 deletions.
diff --git a/commons/zenoh-buffers/src/zslice.rs b/commons/zenoh-buffers/src/zslice.rs
@@ -98,15 +98,6 @@ pub struct ZSlice {
 }
 
 impl ZSlice {
-    #[deprecated(since = "1.0.0", note = "use `new` instead")]
-    pub fn make(
-        buf: Arc<dyn ZSliceBuffer>,
-        start: usize,
-        end: usize,
-    ) -> Result<ZSlice, Arc<dyn ZSliceBuffer>> {
-        Self::new(buf, start, end)
-    }
-
     #[inline]
     pub fn new(
         buf: Arc<dyn ZSliceBuffer>,

diff --git a/plugins/zenoh-plugin-storage-manager/src/lib.rs b/plugins/zenoh-plugin-storage-manager/src/lib.rs
@@ -37,9 +37,8 @@ use zenoh::{
         zlock, LibLoader,
     },
     key_expr::{keyexpr, KeyExpr, OwnedKeyExpr},
-    prelude::Wait,
     session::Session,
-    Result as ZResult,
+    Result as ZResult, Wait,
 };
 use zenoh_backend_traits::{
     config::{ConfigDiff, PluginConfig, StorageConfig, VolumeConfig},

diff --git a/zenoh-ext/src/publication_cache.rs b/zenoh-ext/src/publication_cache.rs
@@ -21,11 +21,10 @@ use std::{
 use zenoh::{
     internal::{bail, runtime::ZRuntime, ResolveFuture, TerminatableTask},
     key_expr::{keyexpr, KeyExpr, OwnedKeyExpr},
-    prelude::Wait,
     pubsub::FlumeSubscriber,
     query::{Query, Queryable, ZenohParameters},
     sample::{Locality, Sample},
-    Error, Resolvable, Resolve, Result as ZResult, Session,
+    Error, Resolvable, Resolve, Result as ZResult, Session, Wait,
 };
 
 /// The builder of PublicationCache, allowing to configure it.

diff --git a/zenoh-ext/src/querying_subscriber.rs b/zenoh-ext/src/querying_subscriber.rs
@@ -21,17 +21,15 @@ use std::{
 };
 
 #[cfg(feature = "unstable")]
-use zenoh::qos::Reliability;
 use zenoh::{
     handlers::{locked, Callback, DefaultHandler, IntoHandler},
     internal::zlock,
     key_expr::KeyExpr,
-    prelude::Wait,
     pubsub::Subscriber,
     query::{QueryConsolidation, QueryTarget, ReplyKeyExpr, Selector},
     sample::{Locality, Sample, SampleBuilder},
     time::Timestamp,
-    Error, Resolvable, Resolve, Result as ZResult, Session,
+    Error, Resolvable, Resolve, Result as ZResult, Session, Wait,
 };
 
 use crate::ExtractSample;
@@ -129,39 +127,6 @@ impl<'a, 'b, KeySpace> QueryingSubscriberBuilder<'a, 'b, KeySpace, DefaultHandle
 }
 
 impl<'b, Handler> QueryingSubscriberBuilder<'_, 'b, crate::UserSpace, Handler> {
-    /// Change the subscription reliability.
-    #[cfg(feature = "unstable")]
-    #[deprecated(
-        since = "1.0.0",
-        note = "please use `reliability` on `declare_publisher` or `put`"
-    )]
-    #[allow(unused_mut, unused_variables)]
-    pub fn reliability(mut self, reliability: Reliability) -> Self {
-        self
-    }
-
-    /// Change the subscription reliability to Reliable.
-    #[cfg(feature = "unstable")]
-    #[deprecated(
-        since = "1.0.0",
-        note = "please use `reliability` on `declare_publisher` or `put`"
-    )]
-    #[allow(unused_mut)]
-    pub fn reliable(mut self) -> Self {
-        self
-    }
-
-    /// Change the subscription reliability to BestEffort.
-    #[cfg(feature = "unstable")]
-    #[deprecated(
-        since = "1.0.0",
-        note = "please use `reliability` on `declare_publisher` or `put`"
-    )]
-    #[allow(unused_mut)]
-    pub fn best_effort(mut self) -> Self {
-        self
-    }
-
     ///
     ///
     /// Restrict the matching publications that will be receive by this [`Subscriber`]
@@ -504,39 +469,6 @@ impl<
 where
     TryIntoSample: ExtractSample,
 {
-    /// Change the subscription reliability.
-    #[cfg(feature = "unstable")]
-    #[deprecated(
-        since = "1.0.0",
-        note = "please use `reliability` on `declare_publisher` or `put`"
-    )]
-    #[allow(unused_mut, unused_variables)]
-    pub fn reliability(mut self, reliability: Reliability) -> Self {
-        self
-    }
-
-    /// Change the subscription reliability to Reliable.
-    #[cfg(feature = "unstable")]
-    #[deprecated(
-        since = "1.0.0",
-        note = "please use `reliability` on `declare_publisher` or `put`"
-    )]
-    #[allow(unused_mut)]
-    pub fn reliable(mut self) -> Self {
-        self
-    }
-
-    /// Change the subscription reliability to BestEffort.
-    #[cfg(feature = "unstable")]
-    #[deprecated(
-        since = "1.0.0",
-        note = "please use `reliability` on `declare_publisher` or `put`"
-    )]
-    #[allow(unused_mut)]
-    pub fn best_effort(mut self) -> Self {
-        self
-    }
-
     /// Restrict the matching publications that will be receive by this [`FetchingSubscriber`]
     /// to the ones that have the given [`Locality`](Locality).
     #[zenoh_macros::unstable]

diff --git a/zenoh/src/api/session.rs b/zenoh/src/api/session.rs
@@ -681,12 +681,6 @@ impl Session {
             }
         }
     }
-
-    /// Wrap the session into an `Arc`.
-    #[deprecated(since = "1.0.0", note = "use `Session` directly instead")]
-    pub fn into_arc(self) -> Arc<Session> {
-        Arc::new(self)
-    }
 }
 
 impl Session {

diff --git a/zenoh/src/lib.rs b/zenoh/src/lib.rs
@@ -124,9 +124,6 @@ pub use crate::{
     session::{open, Session},
 };
 
-#[deprecated(since = "1.0.0")]
-pub mod prelude;
-
 /// [Key expression](https://github.com/eclipse-zenoh/roadmap/blob/main/rfcs/ALL/Key%20Expressions.md) are Zenoh's address space.
 ///
 /// In Zenoh, operations are performed on keys. To allow addressing multiple keys with a single operation, we use Key Expressions (KE).