Bump GLL

Author: CAD97

Cargo.toml

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

build.rs

@@ -27,8 +27,8 @@ fn main() {
         println!("cargo:rerun-if-changed={}", path.display());
 
         let src = fs::read_to_string(&path).unwrap();
-        let fragment: gll::proc_macro::Grammar = src.parse().unwrap();
-        grammar.extend(fragment.0);
+        let fragment = gll::parse_grammar(src.parse().unwrap()).unwrap();
+        grammar.extend(fragment);
     }
 
     // Generate a Rust parser from the combined grammar and write it out.

src/bin/coverage.rs

@@ -9,7 +9,10 @@ use std::{
 };
 
 use derive_more::Add;
-use gll::runtime::{MoreThanOne, ParseNodeKind, ParseNodeShape};
+use gll::{
+    forest::{MoreThanOne, GrammarReflector},
+    parse_node::ParseNodeShape,
+};
 use rayon::prelude::*;
 use rust_grammar::parse;
 use serde::{Deserialize, Serialize};
@@ -78,7 +81,7 @@ type ModuleContentsHandle = parse::OwnedHandle<
 
 enum Error<A> {
     Lex(proc_macro2::LexError),
-    Parse(gll::runtime::ParseError<A>),
+    Parse(gll::parser::ParseError<A>),
 }
 
 impl<A> From<proc_macro2::LexError> for Error<A> {
@@ -87,8 +90,8 @@ impl<A> From<proc_macro2::LexError> for Error<A> {
     }
 }
 
-impl<A> From<gll::runtime::ParseError<A>> for Error<A> {
-    fn from(error: gll::runtime::ParseError<A>) -> Self {
+impl<A> From<gll::parser::ParseError<A>> for Error<A> {
+    fn from(error: gll::parser::ParseError<A>) -> Self {
         Error::Parse(error)
     }
 }
@@ -159,11 +162,11 @@ fn ambiguity_check(handle: &ModuleContentsHandle) -> Result<(), MoreThanOne> {
                     }
                 }
             };
-            match source.kind.shape() {
+            match forest.grammar.parse_node_shape(source.kind) {
                 ParseNodeShape::Opaque => {}
-                ParseNodeShape::Alias(_) => add_children(&[source.unpack_alias()]),
+                ParseNodeShape::Alias(_) => add_children(&[forest.unpack_alias(source)]),
                 ParseNodeShape::Opt(_) => {
-                    if let Some(child) = source.unpack_opt() {
+                    if let Some(child) = forest.unpack_opt(source) {
                         add_children(&[child]);
                     }
                 }

src/lib.rs

@@ -1,10 +1,11 @@
 #[allow(
-    unused_imports,
     non_camel_case_types,
-    clippy::redundant_closure_call,
-    clippy::type_complexity,
+    unused_imports,
     clippy::cognitive_complexity,
-    clippy::large_enum_variant
+    clippy::large_enum_variant,
+    clippy::needless_lifetimes,
+    clippy::redundant_closure_call,
+    clippy::type_complexity
 )]
 pub mod parse {
     include!(concat!(env!("OUT_DIR"), "/parse.rs"));