From df7c48f0a1236a7b7a3e550835fdee922077d82d Mon Sep 17 00:00:00 2001 From: Matt Brubeck Date: Thu, 21 May 2020 16:10:22 -0700 Subject: [PATCH] Upgrade to nom 4 Fixes #15. Adding an extra newline at the end of the builtin magic file fixed the problem reported in issue #15. There is probably a better way to do this, but I haven't found it yet. --- Cargo.toml | 2 +- src/fdo_magic/builtin/magic | Bin 30405 -> 30406 bytes src/fdo_magic/ruleset.rs | 10 ++-------- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2158446..c925a5b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ publish = false [dependencies] petgraph = "^0.5" -nom = "^3" +nom = "^4" lazy_static = "^1.4" fnv = "^1" diff --git a/src/fdo_magic/builtin/magic b/src/fdo_magic/builtin/magic index a1051c4a195b9b80c8c7ff5a50747bcb92555028..a03c1aa4b3864ba5489c712a0454e58aa7d93a5d 100644 GIT binary patch delta 11 ScmX^5mhsqI#tlcy7`Xr@a0Olf delta 9 QcmX^1mhtFY#tlcy02{#tQvd(} diff --git a/src/fdo_magic/ruleset.rs b/src/fdo_magic/ruleset.rs index 4ef1872..98d12cc 100644 --- a/src/fdo_magic/ruleset.rs +++ b/src/fdo_magic/ruleset.rs @@ -159,15 +159,9 @@ fn gen_graph(magic_rules: Vec) -> DiGraph Result>, String> { - let tuplevec = from_u8_to_tuple_vec(b).to_result().map_err(|e| e.to_string())?; - let mut res = FnvHashMap::>::default(); - - for x in tuplevec { - res.insert(x.0, gen_graph(x.1)); - } - + let tuplevec = from_u8_to_tuple_vec(b).map_err(|e| e.to_string())?.1; + let res = tuplevec.into_iter().map(|x| (x.0, gen_graph(x.1))).collect(); Ok(res) - } /// Loads the given magic file and outputs a vector of MagicEntry structs