From 0a1533d5c6ade063c372134ab4240842d633e923 Mon Sep 17 00:00:00 2001 From: Tomas Tauber <2410580+tomtau@users.noreply.github.com> Date: Thu, 19 Sep 2024 21:04:59 +0800 Subject: [PATCH] bump version and adjust CI guards (#1039) * fix color output in CI --- .github/workflows/ci.yml | 10 +++++----- debugger/Cargo.toml | 8 ++++---- derive/Cargo.toml | 6 +++--- generator/Cargo.toml | 6 +++--- grammars/Cargo.toml | 6 +++--- meta/Cargo.toml | 4 ++-- pest/Cargo.toml | 2 +- pest/src/error.rs | 4 ++-- vm/Cargo.toml | 6 +++--- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ecb75f4f..c1662e1a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: kind: check toolchain: 1.74.0 # needed for `clap` in pest_debugger - name: cargo check - run: cargo check --all --features pretty-print,const_prec_climber,memchr,grammar-extras --all-targets + run: cargo check --all --features pretty-print,const_prec_climber,memchr,grammar-extras,miette-error --all-targets testing: name: Unit, Style, and Lint Testing @@ -44,9 +44,9 @@ jobs: - name: cargo fmt run: cargo fmt --all -- --check - name: cargo clippy - run: cargo clippy --all --features pretty-print,const_prec_climber,memchr,grammar-extras --all-targets -- -Dwarnings + run: cargo clippy --all --features pretty-print,const_prec_climber,memchr,grammar-extras,miette-error --all-targets -- -Dwarnings - name: cargo test - run: cargo test --all --features pretty-print,const_prec_climber,memchr,grammar-extras --release + run: FORCE_COLOR=1 cargo test --all --features pretty-print,const_prec_climber,memchr,grammar-extras,miette-error --release - name: cargo test (ignored) run: cargo test -p pest_grammars --lib --verbose --release -- --ignored tests::toml_handles_deep_nesting_unstable @@ -64,7 +64,7 @@ jobs: kind: check toolchain: 1.74.0 # needed for `clap` in pest_debugger - name: cargo doc - run: cargo doc --all --features pretty-print,const_prec_climber,memchr,grammar-extras + run: cargo doc --all --features pretty-print,const_prec_climber,memchr,grammar-extras,miette-error dependency: name: Minimal Versions Testing @@ -101,7 +101,7 @@ jobs: - name: Install cargo-llvm-cov uses: taiki-e/install-action@cargo-llvm-cov - name: Generate code coverage - run: cargo llvm-cov --features pretty-print,const_prec_climber,memchr,grammar-extras --workspace --lcov --output-path lcov.info + run: FORCE_COLOR=1 cargo llvm-cov --features pretty-print,const_prec_climber,memchr,grammar-extras,miette-error --workspace --lcov --output-path lcov.info - name: Upload Results to Codecov uses: codecov/codecov-action@v3 with: diff --git a/debugger/Cargo.toml b/debugger/Cargo.toml index fb72fcba..e7c78109 100644 --- a/debugger/Cargo.toml +++ b/debugger/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "pest_debugger" description = "pest grammar debugger" -version = "2.7.12" +version = "2.7.13" edition = "2021" authors = [ "Dragoș Tiselice ", @@ -17,9 +17,9 @@ readme = "_README.md" rust-version = "1.61" [dependencies] -pest = { path = "../pest", version = "2.7.12" } -pest_meta = { path = "../meta", version = "2.7.12" } -pest_vm = { path = "../vm", version = "2.7.12" } +pest = { path = "../pest", version = "2.7.13" } +pest_meta = { path = "../meta", version = "2.7.13" } +pest_vm = { path = "../vm", version = "2.7.13" } reqwest = { version = "= 0.11.13", default-features = false, features = [ "blocking", "json", diff --git a/derive/Cargo.toml b/derive/Cargo.toml index 8a76e828..abe5301f 100644 --- a/derive/Cargo.toml +++ b/derive/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "pest_derive" description = "pest's derive macro" -version = "2.7.12" +version = "2.7.13" edition = "2021" authors = ["Dragoș Tiselice "] homepage = "https://pest.rs/" @@ -25,5 +25,5 @@ grammar-extras = ["pest_generator/grammar-extras"] [dependencies] # for tests, included transitively anyway -pest = { path = "../pest", version = "2.7.12", default-features = false } -pest_generator = { path = "../generator", version = "2.7.12", default-features = false } +pest = { path = "../pest", version = "2.7.13", default-features = false } +pest_generator = { path = "../generator", version = "2.7.13", default-features = false } diff --git a/generator/Cargo.toml b/generator/Cargo.toml index 41706bd0..586895be 100644 --- a/generator/Cargo.toml +++ b/generator/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "pest_generator" description = "pest code generator" -version = "2.7.12" +version = "2.7.13" edition = "2021" authors = ["Dragoș Tiselice "] homepage = "https://pest.rs/" @@ -22,8 +22,8 @@ grammar-extras = ["pest_meta/grammar-extras"] export-internal = [] [dependencies] -pest = { path = "../pest", version = "2.7.12", default-features = false } -pest_meta = { path = "../meta", version = "2.7.12" } +pest = { path = "../pest", version = "2.7.13", default-features = false } +pest_meta = { path = "../meta", version = "2.7.13" } proc-macro2 = "1.0" quote = "1.0" syn = "2.0" diff --git a/grammars/Cargo.toml b/grammars/Cargo.toml index a9475e3a..d34847f8 100644 --- a/grammars/Cargo.toml +++ b/grammars/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "pest_grammars" description = "pest popular grammar implementations" -version = "2.7.12" +version = "2.7.13" edition = "2021" authors = ["Dragoș Tiselice "] homepage = "https://pest.rs/" @@ -14,8 +14,8 @@ readme = "_README.md" rust-version = "1.61" [dependencies] -pest = { path = "../pest", version = "2.7.12" } -pest_derive = { path = "../derive", version = "2.7.12" } +pest = { path = "../pest", version = "2.7.13" } +pest_derive = { path = "../derive", version = "2.7.13" } [dev-dependencies] criterion = "0.5" diff --git a/meta/Cargo.toml b/meta/Cargo.toml index 45e88732..ea23106b 100644 --- a/meta/Cargo.toml +++ b/meta/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "pest_meta" description = "pest meta language parser and validator" -version = "2.7.12" +version = "2.7.13" edition = "2021" authors = ["Dragoș Tiselice "] homepage = "https://pest.rs/" @@ -22,7 +22,7 @@ include = [ rust-version = "1.61" [dependencies] -pest = { path = "../pest", version = "2.7.12" } +pest = { path = "../pest", version = "2.7.13" } once_cell = "1.8.0" [build-dependencies] diff --git a/pest/Cargo.toml b/pest/Cargo.toml index a56a5343..2d535bd3 100644 --- a/pest/Cargo.toml +++ b/pest/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "pest" description = "The Elegant Parser" -version = "2.7.12" +version = "2.7.13" edition = "2021" authors = ["Dragoș Tiselice "] homepage = "https://pest.rs/" diff --git a/pest/src/error.rs b/pest/src/error.rs index 0142b342..5b3e194e 100644 --- a/pest/src/error.rs +++ b/pest/src/error.rs @@ -1169,8 +1169,8 @@ mod tests { assert_eq!( format!("{:?}", miette_error), - vec![ - " \u{1b}[31m×\u{1b}[0m Failure to parse at (2, 1)", + [ + " \u{1b}[31m×\u{1b}[0m Failure to parse at Pos((2, 1))", " ╭────", " \u{1b}[2m1\u{1b}[0m │ def", " · \u{1b}[35;1m┬\u{1b}[0m", diff --git a/vm/Cargo.toml b/vm/Cargo.toml index b0b22413..8e99306d 100644 --- a/vm/Cargo.toml +++ b/vm/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "pest_vm" description = "pest grammar virtual machine" -version = "2.7.12" +version = "2.7.13" edition = "2021" authors = ["Dragoș Tiselice "] homepage = "https://pest.rs/" @@ -14,8 +14,8 @@ readme = "_README.md" rust-version = "1.61" [dependencies] -pest = { path = "../pest", version = "2.7.12" } -pest_meta = { path = "../meta", version = "2.7.12" } +pest = { path = "../pest", version = "2.7.13" } +pest_meta = { path = "../meta", version = "2.7.13" } [features] grammar-extras = ["pest_meta/grammar-extras"]