From f533596f15e88c247a855f05c9d11670e04656dd Mon Sep 17 00:00:00 2001 From: Sympatron GmbH <35803463+Sympatron@users.noreply.github.com> Date: Fri, 27 Sep 2024 17:14:29 +0200 Subject: [PATCH] Update lalrpop to 0.21 --- pio-parser/Cargo.toml | 7 ++----- pio-proc/Cargo.toml | 5 +---- pio-proc/src/lib.rs | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/pio-parser/Cargo.toml b/pio-parser/Cargo.toml index f65fe77..b86f448 100644 --- a/pio-parser/Cargo.toml +++ b/pio-parser/Cargo.toml @@ -9,11 +9,8 @@ license = "MIT" repository = "https://github.com/rp-rs/pio-rs" [dependencies] -lalrpop-util = { version = "0.19.6", features = ["lexer"] } +lalrpop-util = { version = "0.21.0", features = ["lexer"] } pio = { path = "..", version = "0.2.1" } [build-dependencies] -lalrpop = "0.19.6" -# This is only here to work around https://github.com/lalrpop/lalrpop/issues/750 -# It should be removed once that workaround is no longer needed. -regex-syntax = { version = "0.6", default-features = false, features = ["unicode"] } +lalrpop = "0.21.0" diff --git a/pio-proc/Cargo.toml b/pio-proc/Cargo.toml index 1cad892..4a3b02b 100644 --- a/pio-proc/Cargo.toml +++ b/pio-proc/Cargo.toml @@ -19,7 +19,4 @@ quote = "1.0" codespan-reporting = "0.11" pio = { path = "..", version = "0.2.0" } pio-parser = { path = "../pio-parser", version = "0.2.0" } -lalrpop-util = "0.19.6" -# This is only here to work around https://github.com/lalrpop/lalrpop/issues/750 -# It should be removed once that workaround is no longer needed. -regex-syntax = { version = "0.6", default-features = false, features = ["unicode"] } +lalrpop-util = "0.21.0" diff --git a/pio-proc/src/lib.rs b/pio-proc/src/lib.rs index 327469d..4895a56 100644 --- a/pio-proc/src/lib.rs +++ b/pio-proc/src/lib.rs @@ -402,7 +402,7 @@ fn parse_error(error: &pio_parser::ParseError, program_source: &str) -> proc_mac ParseError::InvalidToken { location } => { (*location..*location, vec!["invalid token".to_string()]) } - ParseError::UnrecognizedEOF { location, expected } => ( + ParseError::UnrecognizedEof { location, expected } => ( *location..*location, vec![ "unrecognized eof".to_string(),