rust: fix clippy lints for clippy::needless_bool

diff --git a/rust/src/applayertemplate/template.rs b/rust/src/applayertemplate/template.rs
index a00baaf9436e1b07170e024b6d86de7358839799..321d321876a3eb6652fc99eb5a709e897fa2ea30 100644 (file)
--- a/rust/src/applayertemplate/template.rs
+++ b/rust/src/applayertemplate/template.rs
@@ -295,11 +295,7 @@ pub unsafe extern "C" fn rs_template_parse_request(
     stream_slice: StreamSlice,
     _data: *const std::os::raw::c_void
 ) -> AppLayerResult {
-    let eof = if AppLayerParserStateIssetFlag(pstate, APP_LAYER_PARSER_EOF_TS) > 0 {
-        true
-    } else {
-        false
-    };
+    let eof = AppLayerParserStateIssetFlag(pstate, APP_LAYER_PARSER_EOF_TS) > 0;
 
     if eof {
         // If needed, handle EOF, or pass it into the parser.
@@ -327,11 +323,7 @@ pub unsafe extern "C" fn rs_template_parse_response(
     stream_slice: StreamSlice,
     _data: *const std::os::raw::c_void
 ) -> AppLayerResult {
-    let _eof = if AppLayerParserStateIssetFlag(pstate, APP_LAYER_PARSER_EOF_TC) > 0 {
-        true
-    } else {
-        false
-    };
+    let _eof = AppLayerParserStateIssetFlag(pstate, APP_LAYER_PARSER_EOF_TC) > 0;
     let state = cast_pointer!(state, TemplateState);
 
     if stream_slice.is_gap() {

diff --git a/rust/src/nfs/nfs.rs b/rust/src/nfs/nfs.rs
index a96e63f972ad8d8b67ca91e9dc61d424be224b5d..bbbcbe3d63240367b44777066eb67e09a7de3018 100644 (file)
--- a/rust/src/nfs/nfs.rs
+++ b/rust/src/nfs/nfs.rs
@@ -743,7 +743,7 @@ impl NFSState {
         }
 
         // for now assume that stable FILE_SYNC flags means a single chunk
-        let is_last = if w.stable == 2 { true } else { false };
+        let is_last = w.stable == 2;
         let file_handle = w.handle.value.to_vec();
         let file_name = if let Some(name) = self.namemap.get(w.handle.value) {
             SCLogDebug!("WRITE name {:?}", name);

diff --git a/rust/src/nfs/nfs4.rs b/rust/src/nfs/nfs4.rs
index afa96e745e38bafccdab9ceb51a7458a5e3b792a..8de5bcb90aff11bcca80a9cef864f0c4c2d25854 100644 (file)
--- a/rust/src/nfs/nfs4.rs
+++ b/rust/src/nfs/nfs4.rs
@@ -42,7 +42,7 @@ impl NFSState {
      * is not part of the write record itself so we pass it in here. */
     fn write_v4<'b>(&mut self, r: &RpcPacket<'b>, w: &Nfs4RequestWrite<'b>, fh: &'b [u8]) {
         // for now assume that stable FILE_SYNC flags means a single chunk
-        let is_last = if w.stable == 2 { true } else { false };
+        let is_last = w.stable == 2;
         SCLogDebug!("is_last {}", is_last);
 
         let mut fill_bytes = 0;

diff --git a/rust/src/pgsql/pgsql.rs b/rust/src/pgsql/pgsql.rs
index 30e4927b8ceba1de14f5c21ec18c993189a695c2..e5058fc1ef2f81cee068a1d75250e5f8d9c57ef8 100644 (file)
--- a/rust/src/pgsql/pgsql.rs
+++ b/rust/src/pgsql/pgsql.rs
@@ -641,11 +641,7 @@ pub unsafe extern "C" fn rs_pgsql_parse_response(
     flow: *const Flow, state: *mut std::os::raw::c_void, pstate: *mut std::os::raw::c_void,
     stream_slice: StreamSlice, _data: *const std::os::raw::c_void,
 ) -> AppLayerResult {
-    let _eof = if AppLayerParserStateIssetFlag(pstate, APP_LAYER_PARSER_EOF_TC) > 0 {
-        true
-    } else {
-        false
-    };
+    let _eof = AppLayerParserStateIssetFlag(pstate, APP_LAYER_PARSER_EOF_TC) > 0;
 
     let state_safe: &mut PgsqlState = cast_pointer!(state, PgsqlState);
 

diff --git a/rust/src/smb/nbss_records.rs b/rust/src/smb/nbss_records.rs
index 6d73d64abc691adb834c8d1dff9fd14d694f29a7..019040914e933bbf355b2227b49a659304ba49f2 100644 (file)
--- a/rust/src/smb/nbss_records.rs
+++ b/rust/src/smb/nbss_records.rs
@@ -52,14 +52,8 @@ impl<'a> NbssRecord<'a> {
     }
     pub fn is_smb(&self) -> bool {
         let valid = self.is_valid();
-        let smb = if self.data.len() >= 4 &&
-            self.data[1] == b'S' && self.data[2] == b'M' && self.data[3] == b'B' &&
-            (self.data[0] == b'\xFE' || self.data[0] == b'\xFF' || self.data[0] == b'\xFD')
-        {
-            true
-        } else {
-            false
-        };
+        let smb = self.data.len() >= 4 &&
+            self.data[1] == b'S' && self.data[2] == b'M' && self.data[3] == b'B' && (self.data[0] == b'\xFE' || self.data[0] == b'\xFF' || self.data[0] == b'\xFD');
 
         valid && smb
     }

diff --git a/rust/src/smb/smb.rs b/rust/src/smb/smb.rs
index 90f520abe2972fd55b911356ab2e01632c49b1a9..42af767ce7324b4a14257b4a6e8a883133088c52 100644 (file)
--- a/rust/src/smb/smb.rs
+++ b/rust/src/smb/smb.rs
@@ -953,11 +953,7 @@ impl SMBState {
         for tx in &mut self.transactions {
             let found = match tx.type_data {
                 Some(SMBTransactionTypeData::NEGOTIATE(ref x)) => {
-                    if x.smb_ver == smb_ver {
-                        true
-                    } else {
-                        false
-                    }
+                    x.smb_ver == smb_ver
                 },
                 _ => { false },
             };

diff --git a/rust/src/telnet/telnet.rs b/rust/src/telnet/telnet.rs
index 416932c4c20f68b84fc2aa623791001c96514d4f..8f1c5dea71d530144194dd8013c191ea60facd05 100644 (file)
--- a/rust/src/telnet/telnet.rs
+++ b/rust/src/telnet/telnet.rs
@@ -435,11 +435,7 @@ pub unsafe extern "C" fn rs_telnet_parse_request(
     stream_slice: StreamSlice,
     _data: *const std::os::raw::c_void
 ) -> AppLayerResult {
-    let eof = if AppLayerParserStateIssetFlag(pstate, APP_LAYER_PARSER_EOF_TS) > 0 {
-        true
-    } else {
-        false
-    };
+    let eof = AppLayerParserStateIssetFlag(pstate, APP_LAYER_PARSER_EOF_TS) > 0;
 
     if eof {
         // If needed, handle EOF, or pass it into the parser.
@@ -467,11 +463,7 @@ pub unsafe extern "C" fn rs_telnet_parse_response(
     stream_slice: StreamSlice,
     _data: *const std::os::raw::c_void
 ) -> AppLayerResult {
-    let _eof = if AppLayerParserStateIssetFlag(pstate, APP_LAYER_PARSER_EOF_TC) > 0 {
-        true
-    } else {
-        false
-    };
+    let _eof = AppLayerParserStateIssetFlag(pstate, APP_LAYER_PARSER_EOF_TC) > 0;
     let state = cast_pointer!(state, TelnetState);
 
     if stream_slice.is_gap() {