From: Shivani Bhardwaj <shivanib134@gmail.com>
Date: Wed, 4 Sep 2019 12:40:53 +0000 (+0530)
Subject: rust: Get rid of unneeded macros, fix warnings
X-Git-Tag: suricata-5.0.0-rc1~88
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bebea5d4c885194f72d2c86db5c9f50a4c66682;p=thirdparty%2Fsuricata.git

rust: Get rid of unneeded macros, fix warnings
---

diff --git a/rust/src/lib.rs b/rust/src/lib.rs
index 03a3a3b45d..4673e72665 100644
--- a/rust/src/lib.rs
+++ b/rust/src/lib.rs
@@ -15,7 +15,6 @@
  * 02110-1301, USA.
  */
 
-#![allow(ellipsis_inclusive_range_patterns)] // TODO: Remove when MSRV is higher than 1.24
 #![cfg_attr(feature = "strict", deny(warnings))]
 
 #[macro_use]
diff --git a/rust/src/smb/dcerpc.rs b/rust/src/smb/dcerpc.rs
index 1210ecda56..1b947e841e 100644
--- a/rust/src/smb/dcerpc.rs
+++ b/rust/src/smb/dcerpc.rs
@@ -360,7 +360,7 @@ pub fn smb_write_dcerpc_record<'b>(state: &mut SMBState,
                         },
                     }
                 }
-                21...255 => {
+                21..=255 => {
                     tx.set_event(SMBEvent::MalformedData);
                 },
                 _ => { }, // valid type w/o special processing
@@ -478,7 +478,7 @@ fn dcerpc_response_handle<'b>(tx: &mut SMBTransaction,
         DCERPC_TYPE_BINDACK => {
             // handled elsewhere
         },
-        21...255 => {
+        21..=255 => {
             if let Some(SMBTransactionTypeData::DCERPC(ref mut tdn)) = tx.type_data {
                 tdn.set_result(dcer.packet_type);
             }