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.
pull/6304/head
Jason Ish 4 years ago committed by Victor Julien
parent 69cf5c9eea
commit 602bb05e75

@ -56,7 +56,7 @@ pub struct Kerberos5Ticket {
fn parse_kerberos5_request_do(blob: &[u8]) -> IResult<&[u8], ApReq, SecBlobError> 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( let blob = b.as_slice().or(
Err(nom::Err::Error(SecBlobError::KrbFmtError)) Err(nom::Err::Error(SecBlobError::KrbFmtError))
)?; )?;
@ -71,7 +71,7 @@ fn parse_kerberos5_request_do(blob: &[u8]) -> IResult<&[u8], ApReq, SecBlobError
ap_req 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> pub fn parse_kerberos5_request(blob: &[u8]) -> IResult<&[u8], Kerberos5Ticket, SecBlobError>

@ -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> 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); SCLogDebug!("parse_secblob_get_spnego: base_o {:?}", base_o);
let d = match base_o.content.as_slice() { let d = match base_o.content.as_slice() {
Err(_) => { return Err(nom::Err::Error(SecBlobError::NotSpNego)); }, Err(_) => { return Err(nom::Err::Error(SecBlobError::NotSpNego)); },
Ok(d) => d, 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); SCLogDebug!("parse_secblob_get_spnego: sub_o {:?}", o);
let oid = match o.content.as_oid() { 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> 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() { let d = match o.content.as_slice() {
Ok(d) => { Ok(d) => {
SCLogDebug!("d: next data len {}",d.len()); SCLogDebug!("d: next data len {}",d.len());

Loading…
Cancel
Save