From: Jason Ish Date: Wed, 5 Oct 2022 15:05:12 +0000 (-0600) Subject: rust: fix clippy lints for clippy::nonminimal_bool X-Git-Tag: suricata-7.0.0-beta1~34 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ba1d3e300d19f3507b477a73112ec105ebf5d08;p=thirdparty%2Fsuricata.git rust: fix clippy lints for clippy::nonminimal_bool --- diff --git a/rust/src/quic/quic.rs b/rust/src/quic/quic.rs index 846b493199..4df69984ed 100644 --- a/rust/src/quic/quic.rs +++ b/rust/src/quic/quic.rs @@ -180,7 +180,7 @@ impl QuicState { &mut h20, &mut pktnum_buf, ); - if !r1.is_ok() { + if r1.is_err() { return Err(()); } // mutate one at a time diff --git a/rust/src/rdp/parser.rs b/rust/src/rdp/parser.rs index f0b89da0c8..590ef6ff5b 100644 --- a/rust/src/rdp/parser.rs +++ b/rust/src/rdp/parser.rs @@ -501,7 +501,7 @@ fn parse_x224_connection_request(input: &[u8]) -> IResult<&[u8], X224ConnectionR let (i4, src_ref) = be_u16(i3)?; let (i5, class_options) = parse_class_options(i4).map_err(Err::convert)?; // less cr_cdt (u8), dst_ref (u16), src_ref (u16), class_options (u8) - if !(length >= 6) { + if length < 6 { return Err(Err::Error(make_error(i1, ErrorKind::Verify))); } let i6 = i5; @@ -606,7 +606,7 @@ fn parse_x224_connection_confirm(input: &[u8]) -> IResult<&[u8], X224ConnectionC let (i5, class_options) = parse_class_options(i4).map_err(Err::convert)?; // less cr_cdt (u8), dst_ref (u16), src_ref (u16), class_options (u8) - if !(length >= 6) { + if length < 6 { return Err(Err::Error(make_error(i1, ErrorKind::Verify))); } let i6 = i5;