Merge pull request #13 from jazi007/remove-is-some_and

remove usage of is_some_and: stable starting from 1.70.0
tier4 · Sep 20, 2023 · 116c0bd · 116c0bd
2 parents 1ca80fa + af999f2
commit 116c0bd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "safe_drive"
-version = "0.3.4"
+version = "0.3.5"
 edition = "2021"
 authors = [ "Yuuki Takano <yuuki.takano@tier4.jp>, TIER IV, Inc.", "Seio Inoue" ]
 description = "safe_drive: Formally Specified Rust Bindings for ROS2"

diff --git a/src/selector.rs b/src/selector.rs
@@ -1559,27 +1559,32 @@ fn notify_action_client(
  && handler
  .feedback_handler
  .clone()
- .is_some_and(|h| (h.borrow_mut())() == CallbackResult::Remove))
+ .map(|h| (h.borrow_mut())() == CallbackResult::Remove)
+ .unwrap_or(false))
  || (is_status_ready
  && handler
  .status_handler
  .clone()
- .is_some_and(|h| (h.borrow_mut())() == CallbackResult::Remove))
+ .map(|h| (h.borrow_mut())() == CallbackResult::Remove)
+ .unwrap_or(false))
  || (is_goal_response_ready
  && handler
  .goal_handler
  .clone()
- .is_some_and(|h| (h.borrow_mut())() == CallbackResult::Remove))
+ .map(|h| (h.borrow_mut())() == CallbackResult::Remove)
+ .unwrap_or(false))
  || (is_cancel_response_ready
  && handler
  .cancel_goal_handler
  .clone()
- .is_some_and(|h| (h.borrow_mut())() == CallbackResult::Remove))
+ .map(|h| (h.borrow_mut())() == CallbackResult::Remove)
+ .unwrap_or(false))
  || (is_result_response_ready
  && handler
  .result_handler
  .clone()
- .is_some_and(|h| (h.borrow_mut())() == CallbackResult::Remove))
+ .map(|h| (h.borrow_mut())() == CallbackResult::Remove)
+ .unwrap_or(false))
  {
  Ok(None)
  } else {