diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index cced152b6c..1845e77ea0 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -389,7 +389,7 @@ jobs: - run: cargo fmt --check working-directory: rust/derive - run: rustfmt --check rust/src/dns/*.rs rust/src/applayertemplate/*.rs rust/src/asn1/*.rs - rust/src/bittorrent_dht/*.rs rust/src/enip/*.rs rust/src/ffi/*.rs + rust/src/bittorrent_dht/*.rs rust/src/enip/*.rs rust/src/ffi/*.rs rust/src/ftp/*.rs - name: Check if Cargo.lock.in is up to date run: | cp rust/Cargo.lock rust/Cargo.lock.in diff --git a/rust/src/ftp/event.rs b/rust/src/ftp/event.rs index ce25fd2ce1..41984abb8b 100644 --- a/rust/src/ftp/event.rs +++ b/rust/src/ftp/event.rs @@ -48,5 +48,6 @@ pub unsafe extern "C" fn ftp_get_event_info( pub unsafe extern "C" fn ftp_get_event_info_by_id( event_id: u8, event_name: *mut *const c_char, event_type: *mut AppLayerEventType, ) -> c_int { - suricata_ffi::applayer::get_event_info_by_id::(event_id, event_name, event_type) as c_int + suricata_ffi::applayer::get_event_info_by_id::(event_id, event_name, event_type) + as c_int } diff --git a/rust/src/ftp/mod.rs b/rust/src/ftp/mod.rs index 3f943f1a5a..18594f7094 100644 --- a/rust/src/ftp/mod.rs +++ b/rust/src/ftp/mod.rs @@ -39,7 +39,8 @@ fn getu16(i: &[u8]) -> IResult<&[u8], u16> { map_res( map_res(delimited(multispace0, digit1, multispace0), str::from_utf8), FromStr::from_str, - ).parse(i) + ) + .parse(i) } fn parse_u16(i: &[u8]) -> IResult<&[u8], u16> { @@ -58,7 +59,8 @@ fn ftp_active_port(i: &[u8]) -> IResult<&[u8], u16> { tag(","), digit1, tag(","), - ).parse(i)?; + ) + .parse(i)?; let (i, part1) = verify(parse_u16, |&v| v <= u8::MAX as u16).parse(i)?; let (i, _) = tag(",").parse(i)?; let (i, part2) = verify(parse_u16, |&v| v <= u8::MAX as u16).parse(i)?; @@ -79,7 +81,8 @@ fn ftp_pasv_response(i: &[u8]) -> IResult<&[u8], u16> { tag(","), digit1, tag(","), - ).parse(i)?; + ) + .parse(i)?; let (i, part1) = verify(getu16, |&v| v <= u8::MAX as u16).parse(i)?; let (i, _) = tag(",").parse(i)?; let (i, part2) = verify(getu16, |&v| v <= u8::MAX as u16).parse(i)?; diff --git a/rust/src/ftp/response.rs b/rust/src/ftp/response.rs index 3e21c5dd2f..e8c0bf2efe 100644 --- a/rust/src/ftp/response.rs +++ b/rust/src/ftp/response.rs @@ -96,11 +96,7 @@ pub unsafe extern "C" fn SCFTPFreeResponseLine(response: *mut FTPResponseLine) { let response = Box::from_raw(response); if !response.response.is_null() { - let _ = Vec::from_raw_parts( - response.code, - response.code_length, - response.code_length, - ); + let _ = Vec::from_raw_parts(response.code, response.code_length, response.code_length); } if !response.response.is_null() {