fix issue, updating to be compatible with: rust-lang/rust#85482

Signed-off-by: gabrik <[email protected]>
eclipse-fog05 · May 26, 2021 · 9a1acee · 9a1acee
1 parent 49fe340
commit 9a1acee
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 14 deletions.
diff --git a/znrpc-macros/examples/expanded.rs b/znrpc-macros/examples/expanded.rs
@@ -99,7 +99,8 @@ where
         {
             let zinfo = _self.z.info().await;
             let pid = zinfo
-                .get(&zenoh::net::info::ZN_INFO_PID_KEY)?
+                .get(&zenoh::net::info::ZN_INFO_PID_KEY)
+                .ok_or(ZRPCError::MissingValue)?
                 .to_uppercase();
             let rid = match zinfo.get(&zenoh::net::info::ZN_INFO_ROUTER_PID_KEY) {
                 Some(r_info) => {

diff --git a/znrpc-macros/src/lib.rs b/znrpc-macros/src/lib.rs
@@ -638,7 +638,7 @@ impl<'a> ZNServiceGenerator<'a> {
                         S: #service_ident + Send + 'static,
                     {
                         let zinfo = _self.z.info().await;
-                        let pid = zinfo.get(&zenoh::net::info::ZN_INFO_PID_KEY)?.to_uppercase();
+                        let pid = zinfo.get(&zenoh::net::info::ZN_INFO_PID_KEY).ok_or(ZRPCError::MissingValue)?.to_uppercase();
                         let rid = match zinfo.get(&zenoh::net::info::ZN_INFO_ROUTER_PID_KEY) {
                             Some(r_info) => {
                                 if r_info != "" {

diff --git a/zrpc-macros/examples/zworking.rs b/zrpc-macros/examples/zworking.rs
@@ -72,10 +72,12 @@ where
             let zsession = _self.z.session();
             let zinfo = zsession.info().await;
             let pid = zinfo
-                .get(&zenoh::net::info::ZN_INFO_PID_KEY)?
+                .get(&zenoh::net::info::ZN_INFO_PID_KEY)
+                .ok_or(ZRPCError::MissingValue)?
                 .to_uppercase();
             let rid = zinfo
-                .get(&zenoh::net::info::ZN_INFO_ROUTER_PID_KEY)?
+                .get(&zenoh::net::info::ZN_INFO_ROUTER_PID_KEY)
+                .ok_or(ZRPCError::MissingValue)?
                 .split(',')
                 .collect::<Vec<_>>()[0]
                 .to_uppercase();
@@ -563,7 +565,8 @@ impl HelloClient {
             let zsession = z.session();
             let zinfo = zsession.info().await;
             let rid = zinfo
-                .get(&zenoh::net::info::ZN_INFO_ROUTER_PID_KEY)?
+                .get(&zenoh::net::info::ZN_INFO_ROUTER_PID_KEY)
+                .ok_or(ZRPCError::MissingValue)?
                 .split(',')
                 .collect::<Vec<_>>()[0]
                 .to_uppercase();

diff --git a/zrpc-macros/src/lib.rs b/zrpc-macros/src/lib.rs
@@ -515,8 +515,8 @@ impl<'a> ZServiceGenerator<'a> {
 
                         let zsession = _self.z.session();
                         let zinfo = zsession.info().await;
-                        let pid = zinfo.get(&zenoh::net::info::ZN_INFO_PID_KEY)?.to_uppercase();
-                        let rid = zinfo.get(&zenoh::net::info::ZN_INFO_ROUTER_PID_KEY)?.split(",").collect::<Vec<_>>()[0].to_uppercase();
+                        let pid = zinfo.get(&zenoh::net::info::ZN_INFO_PID_KEY).ok_or(ZRPCError::MissingValue)?.to_uppercase();
+                        let rid = zinfo.get(&zenoh::net::info::ZN_INFO_ROUTER_PID_KEY).ok_or(ZRPCError::MissingValue)?.split(",").collect::<Vec<_>>()[0].to_uppercase();
                         let ws = _self.z.workspace(None).await?;
 
 
@@ -1159,7 +1159,7 @@ impl<'a> ZServiceGenerator<'a> {
                         let ws = z.workspace(None).await?;
                         let zsession = z.session();
                         let zinfo = zsession.info().await;
-                        let rid = zinfo.get(&zenoh::net::info::ZN_INFO_ROUTER_PID_KEY)?.split(",").collect::<Vec<_>>()[0].to_uppercase();
+                        let rid = zinfo.get(&zenoh::net::info::ZN_INFO_ROUTER_PID_KEY).ok_or(ZRPCError::MissingValue)?.split(",").collect::<Vec<_>>()[0].to_uppercase();
 
                         let selector = zenoh::Selector::try_from(format!("{}/*/state",#eval_path))?;
                         let mut ds = ws.get(&selector).await?;

diff --git a/zrpc/src/lib.rs b/zrpc/src/lib.rs
@@ -11,7 +11,6 @@
 *   ADLINK fog05 team, <[email protected]>
 *********************************************************************************/
 #![feature(associated_type_bounds)]
-#![feature(try_trait)]
 #![allow(clippy::upper_case_acronyms)]
 
 pub mod zchannel;

diff --git a/zrpc/src/zrpcresult.rs b/zrpc/src/zrpcresult.rs
@@ -104,11 +104,7 @@ impl From<zenoh::ZError> for ZRPCError {
     }
 }
 
-impl From<std::option::NoneError> for ZRPCError {
-    fn from(_err: std::option::NoneError) -> Self {
-        ZRPCError::MissingValue
-    }
-}
+
 impl From<std::io::Error> for ZRPCError {
     fn from(err: std::io::Error) -> Self {
         ZRPCError::IOError(err.to_string())