From a921f9f97d9e9b382ccee594adf2f99472a0e1ce Mon Sep 17 00:00:00 2001 From: Ian Joiner <14581281+iajoiner@users.noreply.github.com> Date: Wed, 2 Oct 2024 14:08:52 -0400 Subject: [PATCH] feat: bump `lalrpop` to 0.22.0 and remove patch from the no std check in CI --- .github/workflows/lint-and-test.yml | 3 +-- Cargo.toml | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml index ae2699609..535e626c0 100644 --- a/.github/workflows/lint-and-test.yml +++ b/.github/workflows/lint-and-test.yml @@ -57,10 +57,9 @@ jobs: run: cargo check -p proof-of-sql --no-default-features --features="perf" - name: Run cargo check (proof-of-sql) (just "std" feature) run: cargo check -p proof-of-sql --no-default-features --features="std" - - name: Run cargo check (proof-of-sql-parser) with no_std target. This requires a lalrpop patch. + - name: Run cargo check (proof-of-sql-parser) with no_std target. run: | rustup target add thumbv7em-none-eabi - printf '\n[patch.crates-io]\nlalrpop = { git = "https://github.com/lalrpop/lalrpop", rev = "173597c" }\nlalrpop-util = { git = "https://github.com/lalrpop/lalrpop", rev = "173597c" }\n' >> Cargo.toml cargo check -p proof-of-sql-parser --target thumbv7em-none-eabi test: diff --git a/Cargo.toml b/Cargo.toml index e338105ec..a25d977d8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,8 +37,8 @@ derive_more = { version = "0.99" } flexbuffers = { version = "2.0.0" } indexmap = { version = "2.1", default-features = false } itertools = { version = "0.13.0", default-features = false, features = ["use_alloc"] } -lalrpop = { version = "0.21.0" } -lalrpop-util = { version = "0.21.0", default-features = false } +lalrpop = { version = "0.22.0" } +lalrpop-util = { version = "0.22.0", default-features = false } merlin = { version = "2" } num-traits = { version = "0.2", default-features = false } num-bigint = { version = "0.4.4", default-features = false }