rust: remove nom 5 dependency

rust/Cargo.toml.in

@@ -22,7 +22,6 @@ debug = []
 debug-validate = []
 
 [dependencies]
-nom = "~5.1.2"
 nom7 = { version="7.0", package="nom" }
 bitflags = "~1.2.1"
 byteorder = "~1.4.2"

rust/src/common.rs

@@ -43,19 +43,6 @@ pub mod nom7 {
     }
 }
 
-#[macro_export]
-macro_rules! take_until_and_consume (
- ( $i:expr, $needle:expr ) => (
-    {
-      let input: &[u8] = $i;
-
-      let (rem, res) = ::nom::take_until!(input, $needle)?;
-      let (rem, _) = ::nom::take!(rem, $needle.len())?;
-      Ok((rem, res))
-    }
-  );
-);
-
 #[cfg(not(feature = "debug-validate"))]
 #[macro_export]
 macro_rules! debug_validate_bug_on (

rust/src/dns/dns.rs

@@ -15,8 +15,6 @@
  * 02110-1301, USA.
  */
 
-extern crate nom;
-
 use std;
 use std::ffi::CString;
 use std::collections::HashMap;

rust/src/lib.rs

@@ -64,9 +64,6 @@
 #![allow(clippy::redundant_pattern_matching)]
 #![allow(clippy::field_reassign_with_default)]
 
-#[macro_use]
-extern crate nom;
-
 #[macro_use]
 extern crate bitflags;
 extern crate byteorder;

rust/src/sip/parser.rs

@@ -221,7 +221,7 @@ pub fn parse_headers(mut input: &[u8]) -> IResult<&[u8], HashMap<String, String>
             Err(Err::Failure(_)) => {}
             Err(Err::Incomplete(e)) => return Err(Err::Incomplete(e)),
         };
-        let (rest, header) = try_parse!(input, message_header);
+        let (rest, header) = message_header(input)?;
         headers_map.insert(header.name, header.value);
         input = rest;
     }

rust/src/tftp/tftp.rs

@@ -17,8 +17,6 @@
 
 // written by Clément Galland <clement.galland@epita.fr>
 
-extern crate nom;
-
 use std::str;
 use std;
 use nom7::IResult;