From b9390b6427c23ee9bd8a6a96d890f81188610b2f Mon Sep 17 00:00:00 2001
From: Philippe Antoine <pantoine@oisf.net>
Date: Tue, 20 Jun 2023 09:59:07 +0200
Subject: [PATCH] rust: lightweight rustfmt

---
 qa/rustfmt.txt           | 7 +++++++
 rust/src/ffi/base64.rs   | 2 +-
 rust/src/http2/detect.rs | 2 +-
 rust/src/krb/detect.rs   | 1 -
 rust/src/quic/frames.rs  | 3 +--
 rust/src/rdp/log.rs      | 2 +-
 rust/src/rfb/parser.rs   | 2 +-
 rust/src/sip/log.rs      | 2 +-
 8 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/qa/rustfmt.txt b/qa/rustfmt.txt
index a7f9f2ab43a4..0e3e29183c9e 100644
--- a/qa/rustfmt.txt
+++ b/qa/rustfmt.txt
@@ -48,3 +48,10 @@ rust/src/quic/parser.rs
 rust/src/quic/cyu.rs
 rust/src/quic/crypto.rs
 rust/src/common.rs
+rust/src/sip/log.rs
+rust/src/rdp/log.rs
+rust/src/rfb/parser.rs
+rust/src/http2/detect.rs
+rust/src/ffi/base64.rs
+rust/src/krb/detect.rs
+rust/src/quic/frames.rs
diff --git a/rust/src/ffi/base64.rs b/rust/src/ffi/base64.rs
index 0019a6ff2b6f..ccec3d98eb35 100644
--- a/rust/src/ffi/base64.rs
+++ b/rust/src/ffi/base64.rs
@@ -15,8 +15,8 @@
  * 02110-1301, USA.
  */
 
-use std::os::raw::c_uchar;
 use libc::c_ulong;
+use std::os::raw::c_uchar;
 
 #[repr(C)]
 #[allow(non_camel_case_types)]
diff --git a/rust/src/http2/detect.rs b/rust/src/http2/detect.rs
index 99261adc4c41..578ce7d18736 100644
--- a/rust/src/http2/detect.rs
+++ b/rust/src/http2/detect.rs
@@ -537,7 +537,7 @@ fn http2_tx_get_resp_line(tx: &mut HTTP2Transaction) {
         return;
     }
     let empty = Vec::new();
-    let mut resp_line : Vec<u8> = Vec::new();
+    let mut resp_line: Vec<u8> = Vec::new();
 
     let status =
         if let Ok(value) = http2_frames_get_header_firstvalue(tx, Direction::ToClient, ":status") {
diff --git a/rust/src/krb/detect.rs b/rust/src/krb/detect.rs
index ab003629b58c..606c41a295ec 100644
--- a/rust/src/krb/detect.rs
+++ b/rust/src/krb/detect.rs
@@ -103,7 +103,6 @@ impl DetectKrb5TicketEncryptionList {
     }
 }
 
-
 // Suppress large enum variant lint as the LIST is very large compared
 // to the boolean variant.
 #[derive(Debug)]
diff --git a/rust/src/quic/frames.rs b/rust/src/quic/frames.rs
index e1fb7d080727..97de729bfa2a 100644
--- a/rust/src/quic/frames.rs
+++ b/rust/src/quic/frames.rs
@@ -504,8 +504,7 @@ impl Frame {
             let mut d = vec![0; crypto_max_size as usize];
             for f in &frames {
                 if let Frame::CryptoFrag(c) = f {
-                    d[c.offset as usize..(c.offset + c.length) as usize]
-                        .clone_from_slice(&c.data);
+                    d[c.offset as usize..(c.offset + c.length) as usize].clone_from_slice(&c.data);
                 }
             }
             if let Ok((_, msg)) = parse_tls_message_handshake(&d) {
diff --git a/rust/src/rdp/log.rs b/rust/src/rdp/log.rs
index e0a71a839b8f..ee9059c9fb40 100644
--- a/rust/src/rdp/log.rs
+++ b/rust/src/rdp/log.rs
@@ -21,7 +21,7 @@ use super::rdp::{RdpTransaction, RdpTransactionItem};
 use crate::jsonbuilder::{JsonBuilder, JsonError};
 use crate::rdp::parser::*;
 use crate::rdp::windows;
-use x509_parser::prelude::{X509Certificate, FromDer};
+use x509_parser::prelude::{FromDer, X509Certificate};
 
 #[no_mangle]
 pub extern "C" fn rs_rdp_to_json(tx: &mut RdpTransaction, js: &mut JsonBuilder) -> bool {
diff --git a/rust/src/rfb/parser.rs b/rust/src/rfb/parser.rs
index 0fba65333a36..26ae79e3e337 100644
--- a/rust/src/rfb/parser.rs
+++ b/rust/src/rfb/parser.rs
@@ -24,7 +24,7 @@ use nom7::*;
 use std::fmt;
 use std::str;
 
-#[derive(Debug,PartialEq)]
+#[derive(Debug, PartialEq)]
 pub enum RFBGlobalState {
     TCServerProtocolVersion,
     TCSupportedSecurityTypes,
diff --git a/rust/src/sip/log.rs b/rust/src/sip/log.rs
index 792acfa49021..a7a98d5eb1b3 100644
--- a/rust/src/sip/log.rs
+++ b/rust/src/sip/log.rs
@@ -51,4 +51,4 @@ fn log(tx: &SIPTransaction, js: &mut JsonBuilder) -> Result<(), JsonError> {
 #[no_mangle]
 pub extern "C" fn rs_sip_log_json(tx: &mut SIPTransaction, js: &mut JsonBuilder) -> bool {
     log(tx, js).is_ok()
-}
\ No newline at end of file
+}