Bump nom version

This commit is contained in:
QuantumEntangledAndy committed 2021-04-18 08:13:01 +07:00
1 parent 6ac4b70ff3
commit 05cb032d3c
3 files changed
+272 -256

No files matched your search

Generated
+261 -248
View File
File diff suppressed because it is too large. Load diff
+1 -1
View File
@@ -25,7 +25,7 @@ log = { version = "0.4" }
indoc = "0.3"
itertools = "0.9"
md5 = "0.7"
nom = "5.1"
nom = "6.1.2"
regex = "1"
serde = { version = "1.0", features = ["derive"] }
socket2 = "0.3"
+10 -7
View File
@@ -15,10 +15,10 @@ pub enum Error {
IoError(#[error(source)] std::io::Error),
}
type NomErrorTuple<'a> = (&'a [u8], nom::error::ErrorKind);
type NomErrorType<'a> = nom::error::Error<&'a [u8]>;
impl<'a> From<nom::Err<NomErrorTuple<'a>>> for Error {
fn from(k: nom::Err<NomErrorTuple<'a>>) -> Self {
impl<'a> From<nom::Err<NomErrorType<'a>>> for Error {
fn from(k: nom::Err<NomErrorType<'a>>) -> Self {
let reason = match k {
nom::Err::Error(_) => "Nom Error",
nom::Err::Failure(_) => "Nom Failure",
@@ -38,7 +38,7 @@ impl Bc {
fn read_from_reader<P, O, E, R>(mut parser: P, mut rdr: R) -> Result<O, E>
where
R: Read,
E: for<'a> From<nom::Err<NomErrorTuple<'a>>> + From<std::io::Error>,
E: for<'a> From<nom::Err<NomErrorType<'a>>> + From<std::io::Error>,
P: FnMut(&[u8]) -> nom::IResult<&[u8], O>,
{
let mut input: Vec<u8> = Vec::new();
@@ -47,14 +47,17 @@ where
Ok((_, parsed)) => return Ok(parsed),
Err(nom::Err::Incomplete(needed)) => {
match needed {
nom::Needed::Unknown => 1, // read one byte
nom::Needed::Unknown => std::num::NonZeroUsize::new(1).unwrap(), // read one byte
nom::Needed::Size(len) => len,
}
}
Err(e) => return Err(e.into()),
};
if 0 == (&mut rdr).take(to_read as u64).read_to_end(&mut input)? {
if 0 == (&mut rdr)
.take(to_read.get() as u64)
.read_to_end(&mut input)?
{
return Err(std::io::Error::new(
std::io::ErrorKind::UnexpectedEof,
"Read returned 0 bytes",
@@ -93,7 +96,7 @@ fn bc_body<'a, 'b, 'c>(
}
}
fn hex32<'a>() -> impl Fn(&'a [u8]) -> IResult<&'a [u8], String> {
fn hex32<'a>() -> impl FnMut(&'a [u8]) -> IResult<&'a [u8], String> {
map_res(take(32usize), |slice: &'a [u8]| {
String::from_utf8(slice.to_vec())
})