Update nom to version 6

Cargo.toml

@@ -8,7 +8,7 @@ version = "0.1.0"
 
 [dependencies]
 clap = "2.33"
-nom = "5.0"
-nom_locate = "2.0"
+nom = "6.0"
+nom_locate = "3.0"
 proc-macro2 = "1.0"
 quote = "1.0"

src/idl/common.rs

@@ -2,7 +2,7 @@ use nom::{
     bytes::complete::{take_while, take_while1},
     character::complete::char,
     combinator::{cut, map, opt},
-    multi::separated_list,
+    multi::separated_list0,
     sequence::{pair, preceded, terminated},
     IResult,
 };
@@ -40,7 +40,7 @@ fn parse_generics(input: Span) -> IResult<Span, Vec<String>> {
         opt(preceded(
             preceded(ws, char('<')),
             cut(terminated(
-                separated_list(parse_field_separator, preceded(ws, parse_identifier)),
+                separated_list0(parse_field_separator, preceded(ws, parse_identifier)),
                 preceded(trailing_comma, preceded(ws, char('>'))),
             )),
         )),
@@ -80,14 +80,17 @@ fn test_parse_identifier_invalid() {
     use nom::error::ErrorKind;
     assert_eq!(
         parse_identifier(Span::new("123test")),
-        Err(nom::Err::Error((
-            Span::new("123test"),
-            ErrorKind::TakeWhile1
-        )))
+        Err(nom::Err::Error(nom::error::Error {
+            input: Span::new("123test"),
+            code: ErrorKind::TakeWhile1
+        }))
     );
     assert_eq!(
         parse_identifier(Span::new("_test")),
-        Err(nom::Err::Error((Span::new("_test"), ErrorKind::TakeWhile1)))
+        Err(nom::Err::Error(nom::error::Error {
+            input: Span::new("_test"),
+            code: ErrorKind::TakeWhile1
+        }))
     );
 }
 

src/idl/enum.rs

@@ -3,7 +3,7 @@ use nom::{
     character::complete::char,
     combinator::{cut, map, opt},
     error::context,
-    multi::separated_list,
+    multi::separated_list0,
     sequence::{pair, preceded, terminated, tuple},
     IResult,
 };
@@ -66,7 +66,7 @@ fn parse_enum_variants(input: Span) -> IResult<Span, Vec<EnumVariant>> {
         preceded(
             preceded(ws, char('{')),
             cut(terminated(
-                separated_list(parse_field_separator, preceded(ws, parse_enum_variant)),
+                separated_list0(parse_field_separator, preceded(ws, parse_enum_variant)),
                 preceded(trailing_comma, preceded(ws, char('}'))),
             )),
         ),

src/idl/errors.rs

@@ -4,7 +4,7 @@ use crate::idl::common::Span;
 
 #[derive(Debug, PartialEq)]
 pub enum ParseError<'a> {
-    Nom(nom::Err<(Span<'a>, nom::error::ErrorKind)>),
+    Nom(nom::Err<nom::error::Error<Span<'a>>>),
     TrailingGarbage(Span<'a>),
 }