Fix latest Clippy findings

Author: sophokles73

src/communication/default_pubsub.rs

@@ -153,7 +153,7 @@ impl SubscriptionChangeListener {
     fn has_handler(&self, topic: &UUri) -> bool {
         self.subscription_change_handlers
             .read()
-            .map_or(false, |handlers| handlers.contains_key(topic))
+            .is_ok_and(|handlers| handlers.contains_key(topic))
     }
 }
 
@@ -541,7 +541,7 @@ mod tests {
                 };
                 payload.value == *"Hello"
                     && message.is_publish()
-                    && message.attributes.as_ref().map_or(false, |attribs| {
+                    && message.attributes.as_ref().is_some_and(|attribs| {
                         attribs.id.as_ref() == Some(&expected_message_id)
                             && attribs.priority.value() == UPriority::UPRIORITY_CS3.value()
                             && attribs.ttl == Some(5_000)

src/communication/in_memory_rpc_client.rs

@@ -126,9 +126,7 @@ impl ResponseListener {
     fn contains(&self, reqid: &UUID) -> bool {
         self.pending_requests
             .lock()
-            .map_or(false, |pending_requests| {
-                pending_requests.contains_key(reqid)
-            })
+            .is_ok_and(|pending_requests| pending_requests.contains_key(reqid))
     }
 }
 
@@ -401,15 +399,12 @@ mod tests {
             .expect_do_send()
             .once()
             .withf(move |request_message| {
-                request_message
-                    .attributes
-                    .as_ref()
-                    .map_or(false, |attribs| {
-                        attribs.id.as_ref() == Some(&expected_message_id)
-                            && attribs.priority.value() == UPriority::UPRIORITY_CS6.value()
-                            && attribs.ttl == Some(5_000)
-                            && attribs.token == Some("my_token".to_string())
-                    })
+                request_message.attributes.as_ref().is_some_and(|attribs| {
+                    attribs.id.as_ref() == Some(&expected_message_id)
+                        && attribs.priority.value() == UPriority::UPRIORITY_CS6.value()
+                        && attribs.ttl == Some(5_000)
+                        && attribs.token == Some("my_token".to_string())
+                })
             })
             .returning(move |_request_message| {
                 request_sent_clone.notify_one();
@@ -496,9 +491,7 @@ mod tests {
                 request_message
                     .attributes
                     .as_ref()
-                    .map_or(false, |attribs| {
-                        attribs.id.as_ref() == Some(&expected_message_id)
-                    })
+                    .is_some_and(|attribs| attribs.id.as_ref() == Some(&expected_message_id))
             })
             .returning(move |_request_message| {
                 first_request_sent_clone.notify_one();

src/communication/in_memory_rpc_server.rs

@@ -459,7 +459,7 @@ mod tests {
                         .attributes
                         .get_or_default()
                         .commstatus
-                        .map_or(false, |v| v.enum_value_or_default() == error.get_code())
+                        .is_some_and(|v| v.enum_value_or_default() == error.get_code())
             })
             .returning(move |_msg| {
                 notify_clone.notify_one();
@@ -650,7 +650,7 @@ mod tests {
                         .attributes
                         .get_or_default()
                         .commstatus
-                        .map_or(false, |v| v.enum_value_or_default() == error.get_code())
+                        .is_some_and(|v| v.enum_value_or_default() == error.get_code())
                     && response_message
                         .attributes
                         .get_or_default()
@@ -721,7 +721,7 @@ mod tests {
                         .attributes
                         .get_or_default()
                         .commstatus
-                        .map_or(false, |v| v.enum_value_or_default() == error.get_code())
+                        .is_some_and(|v| v.enum_value_or_default() == error.get_code())
                     && response_message
                         .attributes
                         .get_or_default()

src/uattributes.rs

@@ -68,9 +68,7 @@ impl UAttributes {
     /// assert!(attribs.is_publish());
     /// ```
     pub fn is_publish(&self) -> bool {
-        self.type_
-            .enum_value()
-            .map_or(false, |v| v == UMessageType::UMESSAGE_TYPE_PUBLISH)
+        self.type_.enum_value() == Ok(UMessageType::UMESSAGE_TYPE_PUBLISH)
     }
 
     /// Checks if these are the attributes for an RPC Request message.
@@ -87,9 +85,7 @@ impl UAttributes {
     /// assert!(attribs.is_request());
     /// ```
     pub fn is_request(&self) -> bool {
-        self.type_
-            .enum_value()
-            .map_or(false, |v| v == UMessageType::UMESSAGE_TYPE_REQUEST)
+        self.type_.enum_value() == Ok(UMessageType::UMESSAGE_TYPE_REQUEST)
     }
 
     /// Checks if these are the attributes for an RPC Response message.
@@ -106,9 +102,7 @@ impl UAttributes {
     /// assert!(attribs.is_response());
     /// ```
     pub fn is_response(&self) -> bool {
-        self.type_
-            .enum_value()
-            .map_or(false, |v| v == UMessageType::UMESSAGE_TYPE_RESPONSE)
+        self.type_.enum_value() == Ok(UMessageType::UMESSAGE_TYPE_RESPONSE)
     }
 
     /// Checks if these are the attributes for a Notification message.
@@ -125,8 +119,6 @@ impl UAttributes {
     /// assert!(attribs.is_notification());
     /// ```
     pub fn is_notification(&self) -> bool {
-        self.type_
-            .enum_value()
-            .map_or(false, |v| v == UMessageType::UMESSAGE_TYPE_NOTIFICATION)
+        self.type_.enum_value() == Ok(UMessageType::UMESSAGE_TYPE_NOTIFICATION)
     }
 }

src/uattributes/uattributesvalidator.rs

@@ -64,7 +64,7 @@ pub trait UAttributesValidator: Send {
         if attributes
             .id
             .as_ref()
-            .map_or(false, |id| id.is_uprotocol_uuid())
+            .is_some_and(|id| id.is_uprotocol_uuid())
         {
             Ok(())
         } else {
@@ -515,7 +515,7 @@ impl ResponseValidator {
         if !attributes
             .reqid
             .as_ref()
-            .map_or(false, |id| id.is_uprotocol_uuid())
+            .is_some_and(|id| id.is_uprotocol_uuid())
         {
             Err(UAttributesError::validation_error(
                 "Request ID is not a valid uProtocol UUID",

src/umessage.rs

@@ -92,7 +92,7 @@ impl UMessage {
     pub fn is_publish(&self) -> bool {
         self.attributes
             .as_ref()
-            .map_or(false, |attribs| attribs.is_publish())
+            .is_some_and(|attribs| attribs.is_publish())
     }
 
     /// Checks if this is an RPC Request message.
@@ -115,7 +115,7 @@ impl UMessage {
     pub fn is_request(&self) -> bool {
         self.attributes
             .as_ref()
-            .map_or(false, |attribs| attribs.is_request())
+            .is_some_and(|attribs| attribs.is_request())
     }
 
     /// Checks if this is an RPC Response message.
@@ -138,7 +138,7 @@ impl UMessage {
     pub fn is_response(&self) -> bool {
         self.attributes
             .as_ref()
-            .map_or(false, |attribs| attribs.is_response())
+            .is_some_and(|attribs| attribs.is_response())
     }
 
     /// Checks if this is a Notification message.
@@ -161,7 +161,7 @@ impl UMessage {
     pub fn is_notification(&self) -> bool {
         self.attributes
             .as_ref()
-            .map_or(false, |attribs| attribs.is_notification())
+            .is_some_and(|attribs| attribs.is_notification())
     }
 
     /// If `UMessage` payload is available, deserialize it as a protobuf `Message`.