]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
rust: fix new clippy issues with MSRV update
authorJason Ish <jason.ish@oisf.net>
Thu, 5 Jun 2025 17:30:28 +0000 (11:30 -0600)
committerVictor Julien <victor@inliniac.net>
Fri, 6 Jun 2025 18:08:47 +0000 (20:08 +0200)
rust/src/jsonbuilder.rs
rust/src/krb/log.rs
rust/src/ldap/ldap.rs

index abdf329a103ace9483cc6fbb435bdb37ee1d9454..76c882bd7f2e745f4a8a77e5e1137481510b356c 100644 (file)
@@ -809,7 +809,7 @@ impl JsonBuilder {
     }
 
     fn encode_base64(&mut self, val: &[u8]) -> Result<&mut Self, JsonError> {
-        let encoded_len = 4 * ((val.len() + 2) / 3);
+        let encoded_len = 4 * val.len().div_ceil(3);
         if self.buf.capacity() < self.buf.len() + encoded_len {
             self.buf.try_reserve(encoded_len)?;
         }
index 088081814e7fea300be0a7e88c0714a5eb71feeb..a553a1cb628303b3c68c152a2ac4dbbc6d540bb6 100644 (file)
@@ -61,7 +61,7 @@ fn krb5_log_response(jsb: &mut JsonBuilder, tx: &KRB5Transaction) -> Result<(),
     jsb.set_string("encryption", &encryption)?;
     jsb.set_bool(
         "weak_encryption",
-        tx.etype.map_or(false, test_weak_encryption),
+        tx.etype.is_some_and(test_weak_encryption),
     )?;
     if let Some(x) = tx.ticket_etype {
         let refs = format!("{:?}", x);
index 2a571b43bc0b6f3c78a4cf05d835160b5363c3cd..431967df3fc1476d0d9340fcf592cd824171fcf7 100644 (file)
@@ -178,8 +178,7 @@ impl LdapState {
     fn find_request(&mut self, message_id: MessageID) -> Option<&mut LdapTransaction> {
         self.transactions.iter_mut().find(|tx| {
             tx.request
-                .as_ref()
-                .map_or(false, |req| req.message_id == message_id)
+                .as_ref().is_some_and(|req| req.message_id == message_id)
         })
     }