Skip to content

Commit

Permalink
Update nom requirement from 5.0.0 to 6.0.0 (#23)
Browse files Browse the repository at this point in the history
Updates the requirements on [nom](https://github.com/Geal/nom) to permit the latest version.
- [Release notes](https://github.com/Geal/nom/releases)
- [Changelog](https://github.com/Geal/nom/blob/master/CHANGELOG.md)
- [Commits](rust-bakery/nom@5.0.0...6.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
  • Loading branch information
dependabot-preview[bot] committed Nov 2, 2020
1 parent 508050a commit f1a3d53
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Expand Up @@ -15,7 +15,7 @@ coveralls = { repository = "Ortham/esplugin" }

[dependencies]
encoding_rs = "0.8.17"
nom = "5.0.0"
nom = "6.0.0"
flate2 = { version = "1.0.1", optional = true }

[dev-dependencies]
Expand Down
10 changes: 5 additions & 5 deletions src/error.rs
Expand Up @@ -32,13 +32,13 @@ pub enum Error {
DecodeError,
}

impl From<Err<(&[u8], nom::error::ErrorKind)>> for Error {
fn from(error: Err<(&[u8], nom::error::ErrorKind)>) -> Self {
impl From<Err<nom::error::Error<&[u8]>>> for Error {
fn from(error: Err<nom::error::Error<&[u8]>>) -> Self {
match error {
Err::Incomplete(_) => Error::ParsingIncomplete,
Err::Error((input, kind)) | Err::Failure((input, kind)) => Error::ParsingError(
input.to_vec(),
ParsingErrorKind::GenericParserError(kind.description().to_string()),
Err::Error(err) | Err::Failure(err) => Error::ParsingError(
err.input.to_vec(),
ParsingErrorKind::GenericParserError(err.code.description().to_string()),
),
}
}
Expand Down
5 changes: 3 additions & 2 deletions src/plugin.rs
Expand Up @@ -486,8 +486,9 @@ fn parse_record_ids<'a>(
} else {
// Map to the Alpha error kind even though it's misleading, because it
// doesn't actually matter what is chosen, the detail is discarded.
let masters = masters(&header_record)
.map_err(|_| nom::Err::Error((input, nom::error::ErrorKind::Alpha)))?;
let masters = masters(&header_record).map_err(|_| {
nom::Err::Error(nom::error::Error::new(input, nom::error::ErrorKind::Alpha))
})?;

let (remaining_input, form_ids) = parse_form_ids(input, game_id)?;
let form_ids = hashed_form_ids(&form_ids, game_id, filename, &masters).into();
Expand Down
4 changes: 2 additions & 2 deletions src/record.rs
Expand Up @@ -168,14 +168,14 @@ impl Record {
let (_, record_id) = parse_morrowind_record_id(subrecords_data, &header)?;
Ok((remaining_input, record_id))
} else {
let parser = tuple((
let mut parser = tuple((
delimited(take(RECORD_TYPE_LENGTH), le_u32, take(4usize)),
terminated(le_u32, take(4usize)),
));

let (remaining_input, (size_of_subrecords, form_id)) = parser(input)?;

let parser = pair(
let mut parser = pair(
cond(game_id != GameId::Oblivion, take(4usize)),
take(size_of_subrecords),
);
Expand Down

0 comments on commit f1a3d53

Please sign in to comment.