elkowar/eww
1
1
Fork 0
mirror of https://github.com/elkowar/eww.git synced 2024-07-14 23:20:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update lalrpop

Browse Source
This commit is contained in:
elkowar 2024-02-17 14:46:20 +01:00
parent 4385782be4
commit efea88598c
No known key found for this signature in database
GPG Key ID: 862BA3D7D7760F13
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Cargo.lock generated
View File

@ -1366,9 +1366,9 @@ dependencies = [
[[package]]
name = "lalrpop"
version = "0.19.12"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a1cbf952127589f2851ab2046af368fd20645491bb4b376f04b7f94d7a9837b"
checksum = "da4081d44f4611b66c6dd725e6de3169f9f63905421e8626fcb86b6a898998b8"
dependencies = [
"ascii-canvas",
"bit-set",
@ -1378,8 +1378,9 @@ dependencies = [
"itertools 0.10.5",
"lalrpop-util",
"petgraph",
"pico-args",
"regex",
"regex-syntax 0.6.29",
"regex-syntax 0.7.5",
"string_cache",
"term",
"tiny-keccak",
@ -1388,9 +1389,9 @@ dependencies = [
[[package]]
name = "lalrpop-util"
version = "0.19.12"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3c48237b9604c5a4702de6b824e02006c3214327564636aef27c1028a8fa0ed"
checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d"
dependencies = [
"regex",
]
@ -1733,6 +1734,12 @@ dependencies = [
"siphasher",
]
[[package]]
name = "pico-args"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
[[package]]
name = "pin-project-lite"
version = "0.2.13"
@ -1935,9 +1942,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
version = "0.6.29"
version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
[[package]]
name = "regex-syntax"

4
Cargo.toml
View File

@ -26,8 +26,8 @@ jaq-parse = "1.0.2"
jaq-std = {version = "1.2.1", features = ["bincode"]}
jaq-interpret = "1.2.1"
jaq-syn = "1.1.0"
lalrpop = "0.19.5"
lalrpop-util = "0.19.5"
lalrpop = { version = "0.20.0", features = ["unicode"] }
lalrpop-util = { version = "0.20.0", features = ["unicode"] }
libc = "0.2"
log = "0.4"
maplit = "1"

2
crates/simplexpr/src/error.rs
View File

@ -18,7 +18,7 @@ impl Spanned for ParseError {
fn span(&self) -> Span {
match &self.source {
lalrpop_util::ParseError::InvalidToken { location } => Span(*location, *location, self.file_id),
lalrpop_util::ParseError::UnrecognizedEOF { location, expected: _ } => Span(*location, *location, self.file_id),
lalrpop_util::ParseError::UnrecognizedEof { location, expected: _ } => Span(*location, *location, self.file_id),
lalrpop_util::ParseError::UnrecognizedToken { token, expected: _ } => Span(token.0, token.2, self.file_id),
lalrpop_util::ParseError::ExtraToken { token } => Span(token.0, token.2, self.file_id),
lalrpop_util::ParseError::User { error: LexicalError(span) } => *span,

2
crates/yuck/src/error.rs
View File

@ -40,7 +40,7 @@ pub fn get_parse_error_span<T, E: Spanned>(file_id: usize, err: &lalrpop_util::P
use lalrpop_util::ParseError::*;
match err {
InvalidToken { location } => Span(*location, *location, file_id),
UnrecognizedEOF { location, .. } => Span(*location, *location, file_id),
UnrecognizedEof { location, .. } => Span(*location, *location, file_id),
UnrecognizedToken { token, .. } => Span(token.0, token.2, file_id),
ExtraToken { token } => Span(token.0, token.2, file_id),
User { error } => error.span(),

2
crates/yuck/src/format_diagnostic.rs
View File

@ -163,7 +163,7 @@ pub fn lalrpop_error_to_diagnostic<T: std::fmt::Display, E: Spanned + ToDiagnost
use lalrpop_util::ParseError::*;
match error {
InvalidToken { location } => gen_diagnostic!("Invalid token", Span::point(*location, file_id)),
UnrecognizedEOF { location, expected: _ } => gen_diagnostic! {
UnrecognizedEof { location, expected: _ } => gen_diagnostic! {
msg = "Input ended unexpectedly. Check if you have any unclosed delimiters",
label = Span::point(*location, file_id),
},