Bump gll+grammer again

Author: CAD97

Cargo.toml

@@ -33,5 +33,5 @@ name = "snapshots"
 path = "src/bin/snapshots.rs"
 
 [patch.'crates-io']
-gll = { git = "https://github.com/rust-lang/gll", rev = "f387326ea8fc48762c31f0dd5adc3d8d227328e4" }
-grammer = { git = "https://github.com/lykenware/grammer", rev = "ed4fc4f9be9aa2c1a6c3245ba4e91684ddff5f2f" }
+gll = { git = "https://github.com/rust-lang/gll", rev = "bc72820905eac498c1fb1cc644e931d63e7d07e3" }
+grammer = { git = "https://github.com/lykenware/grammer", rev = "eb47b51a9332c0e82d7c02d988e203d2a01f3654" }

build.rs

@@ -17,7 +17,9 @@ fn main() {
         .filter(|entry| entry.path().extension().map_or(false, |ext| ext == "lyg"));
 
     // Start with the builtin rules for proc-macro grammars.
-    let mut grammar = gll::proc_macro::builtin();
+    let mut cx = gll::proc_macro::Context::new();
+    let cx = &mut cx;
+    let mut grammar = gll::proc_macro::builtin(cx);
 
     // Add in each grammar fragment to the grammar.
     for fragment in fragments {
@@ -27,14 +29,14 @@ fn main() {
         println!("cargo:rerun-if-changed={}", path.display());
 
         let src = fs::read_to_string(&path).unwrap();
-        let fragment = gll::parse_grammar(src.parse().unwrap()).unwrap();
+        let fragment = gll::parse_grammar(cx, src.parse().unwrap()).unwrap();
         grammar.extend(fragment);
     }
 
     // Generate a Rust parser from the combined grammar and write it out.
     fs::write(
         &out_dir.join("parse.rs"),
-        gll::generate::rust::generate(&grammar).to_rustfmt_or_pretty_string(),
+        gll::generate::rust::generate(cx, &grammar).to_rustfmt_or_pretty_string(),
     )
     .unwrap();
 }