Merge branch 'master' into basic_tls_support_2

Author: mjgarton

Cargo.toml

@@ -27,7 +27,7 @@ codecov = { repository = "jonhoo/msql-srv", branch = "master", service = "github
 maintenance = { status = "experimental" }
 
 [dependencies]
-nom = "5"
+nom = "7"
 mysql_common = { version = "0.28.0", features = ["chrono"] }
 byteorder = "1"
 chrono = "0.4"

src/lib.rs

@@ -278,17 +278,22 @@ impl<B: MysqlShim<RW>, RW: Read + Write> MysqlIntermediary<B, RW> {
                         io::ErrorKind::UnexpectedEof,
                         "client sent incomplete handshake",
                     ),
-                    nom::Err::Failure((input, nom_e_kind))
-                    | nom::Err::Error((input, nom_e_kind)) => {
-                        if let nom::error::ErrorKind::Eof = nom_e_kind {
+                    nom::Err::Failure(nom_error) | nom::Err::Error(nom_error) => {
+                        if let nom::error::ErrorKind::Eof = nom_error.code {
                             io::Error::new(
                                 io::ErrorKind::UnexpectedEof,
-                                format!("client did not complete handshake; got {:?}", input),
+                                format!(
+                                    "client did not complete handshake; got {:?}",
+                                    nom_error.input
+                                ),
                             )
                         } else {
                             io::Error::new(
                                 io::ErrorKind::InvalidData,
-                                format!("bad client handshake; got {:?} ({:?})", input, nom_e_kind),
+                                format!(
+                                    "bad client handshake; got {:?} ({:?})",
+                                    nom_error.input, nom_error.code
+                                ),
                             )
                         }
                     }
@@ -329,19 +334,21 @@ impl<B: MysqlShim<RW>, RW: Read + Write> MysqlIntermediary<B, RW> {
                             io::ErrorKind::UnexpectedEof,
                             "client sent incomplete handshake",
                         ),
-                        nom::Err::Failure((input, nom_e_kind))
-                        | nom::Err::Error((input, nom_e_kind)) => {
-                            if let nom::error::ErrorKind::Eof = nom_e_kind {
+                        nom::Err::Failure(nom_error) | nom::Err::Error(nom_error) => {
+                            if let nom::error::ErrorKind::Eof = nom_error.code {
                                 io::Error::new(
                                     io::ErrorKind::UnexpectedEof,
-                                    format!("client did not complete handshake; got {:?}", input),
+                                    format!(
+                                        "client did not complete handshake; got {:?}",
+                                        nom_error.input
+                                    ),
                                 )
                             } else {
                                 io::Error::new(
                                     io::ErrorKind::InvalidData,
                                     format!(
                                         "bad client handshake; got {:?} ({:?})",
-                                        input, nom_e_kind
+                                        nom_error.input, nom_error.code
                                     ),
                                 )
                             }

src/packet.rs

@@ -191,7 +191,7 @@ fn packet(i: &[u8]) -> nom::IResult<&[u8], (u8, Packet)> {
         nom::sequence::pair(
             nom::multi::fold_many0(
                 fullpacket,
-                (0, None),
+                || (0, None),
                 |(seq, pkt): (_, Option<Packet>), (nseq, p)| {
                     let pkt = if let Some(mut pkt) = pkt {
                         assert_eq!(nseq, seq + 1);