fix clippy

Author: abr-egn

macros/src/option.rs

@@ -92,11 +92,7 @@ pub fn option_setters(
     });
     // Append setter fns to `impl` block item list
     for OptInfo { name, attrs, type_ } in opt_info {
-        if args
-            .skip
-            .as_ref()
-            .map_or(false, |skip| skip.contains(&name))
-        {
+        if args.skip.as_ref().is_some_and(|skip| skip.contains(&name)) {
             continue;
         }
         let (accept, value) = if type_.is_ident("String")

src/client/auth/oidc.rs

@@ -978,7 +978,7 @@ pub(super) fn validate_credential(credential: &Credential) -> Result<()> {
     #[cfg(test)]
     if environment
         .as_ref()
-        .map_or(false, |ev| *ev == TEST_ENVIRONMENT_VALUE_STR)
+        .is_ok_and(|ev| *ev == TEST_ENVIRONMENT_VALUE_STR)
         && credential.username.is_some()
     {
         return Err(Error::invalid_argument(format!(

src/sdam/test.rs

@@ -192,7 +192,7 @@ async fn hello_ok_true() {
     event_stream
         .next_match(Duration::from_millis(2000), |event| {
             if let Event::Sdam(SdamEvent::ServerHeartbeatSucceeded(e)) = event {
-                assert_eq!(e.reply.get_bool("helloOk").unwrap(), true);
+                assert!(e.reply.get_bool("helloOk").unwrap());
                 assert!(e.reply.get(LEGACY_HELLO_COMMAND_NAME_LOWERCASE).is_some());
                 assert!(e.reply.get("isWritablePrimary").is_none());
                 return true;

src/test/index_management/search_index.rs

@@ -36,8 +36,7 @@ async fn search_index_create_list() {
     let found = 'outer: loop {
         let mut cursor = coll0.list_search_indexes().await.unwrap();
         while let Some(d) = cursor.try_next().await.unwrap() {
-            if d.get_str("name")
-                .map_or(false, |n| n == "test-search-index")
+            if d.get_str("name").is_ok_and(|n| n == "test-search-index")
                 && d.get_bool("queryable").unwrap_or(false)
             {
                 break 'outer d;
@@ -87,14 +86,11 @@ async fn search_index_create_multiple() {
     loop {
         let mut cursor = coll0.list_search_indexes().await.unwrap();
         while let Some(d) = cursor.try_next().await.unwrap() {
-            if d.get_str("name")
-                .map_or(false, |n| n == "test-search-index-1")
+            if d.get_str("name").is_ok_and(|n| n == "test-search-index-1")
                 && d.get_bool("queryable").unwrap_or(false)
             {
                 index1 = Some(d);
-            } else if d
-                .get_str("name")
-                .map_or(false, |n| n == "test-search-index-2")
+            } else if d.get_str("name").is_ok_and(|n| n == "test-search-index-2")
                 && d.get_bool("queryable").unwrap_or(false)
             {
                 index2 = Some(d);
@@ -145,8 +141,7 @@ async fn search_index_drop() {
     'outer: loop {
         let mut cursor = coll0.list_search_indexes().await.unwrap();
         while let Some(d) = cursor.try_next().await.unwrap() {
-            if d.get_str("name")
-                .map_or(false, |n| n == "test-search-index")
+            if d.get_str("name").is_ok_and(|n| n == "test-search-index")
                 && d.get_bool("queryable").unwrap_or(false)
             {
                 break 'outer;
@@ -198,8 +193,7 @@ async fn search_index_update() {
     'outer: loop {
         let mut cursor = coll0.list_search_indexes().await.unwrap();
         while let Some(d) = cursor.try_next().await.unwrap() {
-            if d.get_str("name")
-                .map_or(false, |n| n == "test-search-index")
+            if d.get_str("name").is_ok_and(|n| n == "test-search-index")
                 && d.get_bool("queryable").unwrap_or(false)
             {
                 break 'outer;
@@ -222,10 +216,9 @@ async fn search_index_update() {
     let found = 'find: loop {
         let mut cursor = coll0.list_search_indexes().await.unwrap();
         while let Some(d) = cursor.try_next().await.unwrap() {
-            if d.get_str("name")
-                .map_or(false, |n| n == "test-search-index")
+            if d.get_str("name").is_ok_and(|n| n == "test-search-index")
                 && d.get_bool("queryable").unwrap_or(false)
-                && d.get_str("status").map_or(false, |s| s == "READY")
+                && d.get_str("status").is_ok_and(|s| s == "READY")
             {
                 break 'find d;
             }
@@ -259,7 +252,7 @@ async fn wait_for_index(coll: &Collection<Document>, name: &str) -> Document {
     while Instant::now() < deadline {
         let mut cursor = coll.list_search_indexes().name(name).await.unwrap();
         while let Some(def) = cursor.try_next().await.unwrap() {
-            if def.get_str("name").map_or(false, |n| n == name)
+            if def.get_str("name").is_ok_and(|n| n == name)
                 && def.get_bool("queryable").unwrap_or(false)
             {
                 return def;

src/test/spec/retryable_writes.rs

@@ -247,7 +247,7 @@ async fn retry_write_retryable_write_error() {
                 if let CommandEvent::Succeeded(ev) = &*msg {
                     if let Some(Bson::Document(wc_err)) = ev.reply.get("writeConcernError") {
                         if ev.command_name == "insert"
-                            && wc_err.get_i32("code").map_or(false, |c| c == 91)
+                            && wc_err.get_i32("code").is_ok_and(|c| c == 91)
                         {
                             // Spawn a new task so events continue to process
                             let client = client.clone();