rust/htp: convert to nom 8

Ticket: OISF#8090

Author: jasonish

rust/Cargo.lock.in

@@ -24,7 +24,7 @@ crate-type = ["staticlib", "rlib", "cdylib"]
 base64 = "0.22.1"
 bstr = "1.12.0"
 libc = "0.2"
-nom = "7.1.3"
+nom = "8.0.0"
 lzma-rs = { version = "0.2.0", features = ["stream"] }
 flate2 = { version = "~1.0.35", features = ["zlib-default"], default-features = false }
 brotli = "~8.0.1"

rust/htp/Cargo.toml.in

@@ -1,4 +1,5 @@
 use brotli;
+use nom::Parser as _;
 use std::{
     io::{Cursor, Write},
     time::Instant,
@@ -455,10 +456,9 @@ impl GzipBufWriter {
     fn parse_start(data: &[u8]) -> nom::IResult<&[u8], u8> {
         use nom::bytes::streaming::tag;
         use nom::number::streaming::{le_i32, le_u8};
-        use nom::sequence::tuple;
 
         let (rest, (_, flags, _mtime, _xfl, _operating_system)) =
-            tuple((tag(b"\x1f\x8b\x08"), le_u8, le_i32, le_u8, le_u8))(data)?;
+            (tag(&b"\x1f\x8b\x08"[..]), le_u8, le_i32, le_u8, le_u8).parse(data)?;
         Ok((rest, flags))
     }
 }
@@ -467,7 +467,6 @@ impl Write for GzipBufWriter {
     fn write(&mut self, data: &[u8]) -> std::io::Result<usize> {
         use nom::bytes::streaming::{tag, take_until};
         use nom::number::streaming::le_u16;
-        use nom::sequence::tuple;
 
         const FHCRC: u8 = 1 << 1;
         const FEXTRA: u8 = 1 << 2;
@@ -534,10 +533,11 @@ impl Write for GzipBufWriter {
                 }
                 GzState::Filename => {
                     if self.flags & FNAME != 0 {
-                        match tuple((
+                        match (
                             take_until::<&[u8], &[u8], nom::error::Error<&[u8]>>(b"\0" as &[u8]),
-                            tag(b"\0"),
-                        ))(parse)
+                            tag(&b"\0"[..]),
+                        )
+                            .parse(parse)
                         {
                             Ok((rest, _)) => {
                                 parse = rest;
@@ -557,10 +557,11 @@ impl Write for GzipBufWriter {
                 }
                 GzState::Comment => {
                     if self.flags & FCOMMENT != 0 {
-                        match tuple((
+                        match (
                             take_until::<&[u8], &[u8], nom::error::Error<&[u8]>>(b"\0" as &[u8]),
-                            tag(b"\0"),
-                        ))(parse)
+                            tag(&b"\0"[..]),
+                        )
+                            .parse(parse)
                         {
                             Ok((rest, _)) => {
                                 parse = rest;