Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ doctest = false
test = false

[patch.'crates-io']
grammer = { git = "https://github.com/lykenware/grammer", rev = "ba41b3049ed294c5606309f82b2708261abddb30" }
grammer = { git = "https://github.com/lykenware/grammer", rev = "6f6f1320336d84b75805907fb302a28cb6d4cfb0" }

[workspace]
members = [
Expand Down
2 changes: 1 addition & 1 deletion macros/tests/basic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ testcases![
},
}",
// FIXME(eddyb) get replace quotes with backticks and pretify the `expected` list.
S("aax") => r#"1:3: error: expected ["d", "d", "a", "b", "a", "c"]"#;
S("aax") => r#"1:3: error: expected ["a", "b", "c", "d"]"#;

gll10_g0_opaque {
S = { a:A s:S "d" } |
Expand Down
2 changes: 1 addition & 1 deletion macros/tests/json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ fn json_like_error() {
stray_identifier
};

let expected = r#"?: error: expected ["null", "false", "true", "[", "{", "(", LITERAL]"#;
let expected = r#"?: error: expected ["(", "[", "{", "false", "null", "true", LITERAL]"#;

json_like_testcase(input, expected);
}
2 changes: 1 addition & 1 deletion src/runtime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ struct RuntimeState<'i, C: CodeLabel> {
memoizer: Memoizer<'i, C>,
}

impl<'i, P, G, C, I: Input, Pat> Runtime<'_, 'i, C, I, Pat>
impl<'i, P, G, C, I: Input, Pat: Ord> Runtime<'_, 'i, C, I, Pat>
where
// FIXME(eddyb) these shouldn't be needed, as they are bounds on
// `GrammarReflector::NodeKind`, but that's ignored currently.
Expand Down