update to nom 7

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

Cargo.toml

@@ -84,7 +84,7 @@ url = "2.1"
 #valgrind_request = { git = "https://github.com/edef1c/libvalgrind_request", version = "1.1.0", optional = true }
 walkdir = "2"
 xdg = "2.2"
-nom = "5.1"
+nom = "7"
 crossbeam-channel = "0.5"
 
 # Used only by examples currently:

debian/control

@@ -32,7 +32,7 @@ Build-Depends: debhelper (>= 12),
  librust-libc-0.2+default-dev,
  librust-log-0.4+default-dev (>= 0.4.17-~~),
  librust-nix-0.24+default-dev,
- librust-nom-5+default-dev (>= 5.1-~~),
+ librust-nom-7+default-dev,
  librust-num-traits-0.2+default-dev,
  librust-once-cell-1+default-dev (>= 1.3.1-~~),
  librust-openssl-0.10+default-dev (>= 0.10.38-~~),

pbs-tools/Cargo.toml

@@ -20,7 +20,7 @@ lazy_static = "1.4"
 libc = "0.2"
 log = "0.4.17"
 nix = "0.24"
-nom = "5.1"
+nom = "7"
 openssl = "0.10"
 percent-encoding = "2.1"
 regex = "1.5"

pbs-tools/src/nom.rs

@@ -4,7 +4,7 @@ use nom::{
     bytes::complete::{take_while, take_while1},
     character::complete::digit1,
     combinator::{all_consuming, map_res, recognize},
-    error::{ParseError, VerboseError},
+    error::{ContextError, VerboseError},
 };
 
 pub type IResult<I, O, E = VerboseError<I>> = Result<(I, O), nom::Err<E>>;
@@ -44,7 +44,7 @@ pub fn parse_u64(i: &str) -> IResult<&str, u64> {
 /// Parse complete input, generate verbose error message with line numbers
 pub fn parse_complete<'a, F, O>(what: &str, i: &'a str, parser: F) -> Result<O, Error>
 where
-    F: Fn(&'a str) -> IResult<&'a str, O>,
+    F: FnMut(&'a str) -> IResult<&'a str, O>,
 {
     match all_consuming(parser)(i) {
         Err(nom::Err::Error(err)) | Err(nom::Err::Failure(err)) => {

src/tools/disks/zpool_status.rs

@@ -157,7 +157,7 @@ fn parse_zpool_status_field(i: &str) -> IResult<&str, (String, String)> {
 
     let indent: usize = prefix_len + 2;
 
-    let parse_continuation = opt(space_indented_line(indent));
+    let mut parse_continuation = opt(space_indented_line(indent));
 
     let mut value = value.to_string();