From: Jason Ish <jason.ish@oisf.net>
Date: Fri, 20 Aug 2021 16:51:46 +0000 (-0600)
Subject: rust(lint): fix redundant closures
X-Git-Tag: suricata-7.0.0-beta1~1523
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=602bb05e75382933359b052e60195a54c1f450a4;p=thirdparty%2Fsuricata.git

rust(lint): fix redundant closures

This lint checks for a closure where a function can be directly
supplied.  Runtime performance is unchanged, but this makes
less work for the compiler.
---

diff --git a/rust/src/kerberos.rs b/rust/src/kerberos.rs
index 06bfda75dc..69e04662c2 100644
--- a/rust/src/kerberos.rs
+++ b/rust/src/kerberos.rs
@@ -56,7 +56,7 @@ pub struct Kerberos5Ticket {
 
 fn parse_kerberos5_request_do(blob: &[u8]) -> IResult<&[u8], ApReq, SecBlobError>
 {
-    let (_,b) = der_parser::parse_der(blob).map_err(|e| nom::Err::convert(e))?;
+    let (_,b) = der_parser::parse_der(blob).map_err(nom::Err::convert)?;
     let blob = b.as_slice().or(
         Err(nom::Err::Error(SecBlobError::KrbFmtError))
     )?;
@@ -71,7 +71,7 @@ fn parse_kerberos5_request_do(blob: &[u8]) -> IResult<&[u8], ApReq, SecBlobError
             ap_req
         })
     )
-    .map_err(|e| nom::Err::convert(e))
+    .map_err(nom::Err::convert)
 }
 
 pub fn parse_kerberos5_request(blob: &[u8]) -> IResult<&[u8], Kerberos5Ticket, SecBlobError>
diff --git a/rust/src/smb/auth.rs b/rust/src/smb/auth.rs
index f90ab0ae61..bd15ca666e 100644
--- a/rust/src/smb/auth.rs
+++ b/rust/src/smb/auth.rs
@@ -27,13 +27,13 @@ use der_parser::der::{parse_der_oid, parse_der_sequence};
 
 fn parse_secblob_get_spnego(blob: &[u8]) -> IResult<&[u8], &[u8], SecBlobError>
 {
-    let (rem, base_o) = der_parser::parse_der(blob).map_err(|e| nom::Err::convert(e))?;
+    let (rem, base_o) = der_parser::parse_der(blob).map_err(nom::Err::convert)?;
     SCLogDebug!("parse_secblob_get_spnego: base_o {:?}", base_o);
     let d = match base_o.content.as_slice() {
         Err(_) => { return Err(nom::Err::Error(SecBlobError::NotSpNego)); },
         Ok(d) => d,
     };
-    let (next, o) = parse_der_oid(d).map_err(|e| nom::Err::convert(e))?;
+    let (next, o) = parse_der_oid(d).map_err(nom::Err::convert)?;
     SCLogDebug!("parse_secblob_get_spnego: sub_o {:?}", o);
 
     let oid = match o.content.as_oid() {
@@ -60,7 +60,7 @@ fn parse_secblob_get_spnego(blob: &[u8]) -> IResult<&[u8], &[u8], SecBlobError>
 
 fn parse_secblob_spnego_start(blob: &[u8]) -> IResult<&[u8], &[u8], SecBlobError>
 {
-    let (rem, o) = der_parser::parse_der(blob).map_err(|e| nom::Err::convert(e))?;
+    let (rem, o) = der_parser::parse_der(blob).map_err(nom::Err::convert)?;
     let d = match o.content.as_slice() {
         Ok(d) => {
             SCLogDebug!("d: next data len {}",d.len());