Rename macro crate, start prepping for publish

Cargo.lock

@@ -138,8 +138,8 @@ dependencies = [
  "compact_str",
  "insta",
  "lexopt",
+ "mzp-peg-macro",
  "nom",
- "peg_macro",
  "rustc-hash",
 ]
 
@@ -149,6 +149,16 @@ version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
 
+[[package]]
+name = "mzp-peg-macro"
+version = "0.1.0"
+dependencies = [
+ "itertools",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "nom"
 version = "8.0.0"
@@ -164,16 +174,6 @@ version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
-[[package]]
-name = "peg_macro"
-version = "0.1.0"
-dependencies = [
- "itertools",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.95"

Cargo.toml

@@ -8,7 +8,7 @@ edition = "2024"
 [dependencies]
 anyhow = "1.0.86"
 codepage-437 = "0.1.0"
-peg_macro = { path = "./peg_macro"}
+mzp-peg-macro = { path = "./mzp_peg_macro", version = "0.1.0" }
 insta = "1.39.0"
 nom = "8.0.0"
 compact_str = "0.9.0"
@@ -27,4 +27,4 @@ name = "marzipan"
 path = "src/main.rs"
 
 [workspace]
-members = [".", "peg_macro"]
+members = [".", "mzp_peg_macro"]

mzp_peg_macro/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "peg_macro"
+name = "mzp-peg-macro"
 version = "0.1.0"
 edition = "2024"
 

src/labels/parse.rs

@@ -121,7 +121,7 @@ pub fn parse_stat_labels(stat: &Stat, ctx: &Context) -> ParsedStat {
 }
 
 mod grammar {
-    use peg_macro::grammar;
+    use mzp_peg_macro::grammar;
 
     grammar! {
         program = (line ("\n" line)*)? EOI;

src/peg/peg.rs

@@ -207,7 +207,7 @@ impl<'a, T: Clone> Capture<'a, T> {
 #[cfg(test)]
 mod tests {
     use insta::assert_debug_snapshot;
-    use peg_macro::grammar;
+    use mzp_peg_macro::grammar;
 
     use super::ParseState;
 

src/world.rs

@@ -128,8 +128,7 @@ pub struct Stat {
 impl World {
     pub fn from_bytes(bytes: &[u8]) -> Result<World, LoadError> {
         let (input, (_, num_boards)) = (tag(&[0xff, 0xff][..]), le_i16).parse(bytes)?;
-        let (input, (ammo, gems, keys)) =
+        let (input, (ammo, gems, keys)) = (le_i16, le_i16, count(bool_u8, 7)).parse(input)?;
-            (le_i16, le_i16, count(bool_u8, 7)).parse(input)?;
         let (input, (health, starting_board, torches, torch_cycles, energizer_cycles)) =
             (le_i16, le_i16, le_i16, le_i16, le_i16).parse(input)?;
         let (input, (_, score, world_name)) = (take(2usize), le_i16, pstring(20)).parse(input)?;