From: Jason Ish <jason.ish@oisf.net>
Date: Wed, 5 Oct 2022 14:53:02 +0000 (-0600)
Subject: rust: fix clippy lints for clippy::char_lit_as_u8
X-Git-Tag: suricata-7.0.0-beta1~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e5401d3e97daa5f66da95f6634ae59574cf92dc;p=thirdparty%2Fsuricata.git

rust: fix clippy lints for clippy::char_lit_as_u8
---

diff --git a/rust/src/dns/parser.rs b/rust/src/dns/parser.rs
index 6dd6466c0d..94f06dbc89 100644
--- a/rust/src/dns/parser.rs
+++ b/rust/src/dns/parser.rs
@@ -69,7 +69,7 @@ pub fn dns_parse_name<'a, 'b>(start: &'b [u8], message: &'b [u8]) -> IResult<&'b
         } else if len & 0b1100_0000 == 0 {
             let (rem, label) = length_data(be_u8)(pos)?;
             if name.len() > 0 {
-                name.push('.' as u8);
+                name.push(b'.');
             }
             name.extend(label);
             pos = rem;
diff --git a/rust/src/http2/detect.rs b/rust/src/http2/detect.rs
index 7a1e689806..e1ba9206de 100644
--- a/rust/src/http2/detect.rs
+++ b/rust/src/http2/detect.rs
@@ -561,7 +561,7 @@ fn http2_lower(value: &[u8]) -> Option<Vec<u8>> {
 
 // returns a tuple with the value and its size
 fn http2_normalize_host(value: &[u8]) -> (Option<Vec<u8>>, usize) {
-    match value.iter().position(|&x| x == ':' as u8) {
+    match value.iter().position(|&x| x == b':') {
         Some(i) => {
             return (http2_lower(&value[..i]), i);
         }
@@ -666,15 +666,15 @@ fn http2_escape_header(blocks: &[parser::HTTP2FrameHeaderBlock], i: u32) -> Vec<
     let mut vec = Vec::with_capacity(normalsize);
     for j in 0..blocks[i as usize].name.len() {
         vec.push(blocks[i as usize].name[j]);
-        if blocks[i as usize].name[j] == ':' as u8 {
-            vec.push(':' as u8);
+        if blocks[i as usize].name[j] == b':' {
+            vec.push(b':');
         }
     }
     vec.extend_from_slice(&[b':', b' ']);
     for j in 0..blocks[i as usize].value.len() {
         vec.push(blocks[i as usize].value[j]);
-        if blocks[i as usize].value[j] == ':' as u8 {
-            vec.push(':' as u8);
+        if blocks[i as usize].value[j] == b':' {
+            vec.push(b':');
         }
     }
     return vec;
diff --git a/rust/src/smb/nbss_records.rs b/rust/src/smb/nbss_records.rs
index 115d15269b..6d73d64abc 100644
--- a/rust/src/smb/nbss_records.rs
+++ b/rust/src/smb/nbss_records.rs
@@ -53,7 +53,7 @@ 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] == 'S' as u8 && self.data[2] == 'M' as u8 && self.data[3] == 'B' as u8 &&
+            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