From d16266af2e8e1da3aa2625f71e6994c67d410aa9 Mon Sep 17 00:00:00 2001 From: Tomas Tauber <2410580+tomtau@users.noreply.github.com> Date: Thu, 4 Jan 2024 22:38:36 +0800 Subject: [PATCH] bump versions + minor clippy fixes (#959) --- .github/workflows/ci.yml | 4 ++-- debugger/Cargo.toml | 8 ++++---- derive/Cargo.toml | 6 +++--- generator/Cargo.toml | 6 +++--- grammars/Cargo.toml | 6 +++--- meta/Cargo.toml | 4 ++-- meta/build.rs | 6 +++++- pest/Cargo.toml | 2 +- pest/tests/json.rs | 2 +- semvercheck.sh | 4 ++-- vm/Cargo.toml | 6 +++--- 11 files changed, 29 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c9b4f0ba..ee630101 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -140,7 +140,7 @@ jobs: with: kind: check components: rust-src - toolchain: nightly-2023-03-20 # upgrade this regularly + toolchain: nightly-2023-12-31 # upgrade this regularly - name: check no_std compatibility run: cd pest && cargo build -j1 -Z build-std=core,alloc --no-default-features --target x86_64-unknown-linux-gnu @@ -156,7 +156,7 @@ jobs: id: setup with: kind: check - toolchain: nightly-2023-03-20 + toolchain: nightly-2023-12-31 tools: cargo-semver-checks - name: check semver compatibility shell: bash diff --git a/debugger/Cargo.toml b/debugger/Cargo.toml index 2a088268..4e2f67b9 100644 --- a/debugger/Cargo.toml +++ b/debugger/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "pest_debugger" description = "pest grammar debugger" -version = "2.7.5" +version = "2.7.6" edition = "2021" authors = ["Dragoș Tiselice ", "Tomas Tauber "] homepage = "https://pest.rs/" @@ -14,9 +14,9 @@ readme = "_README.md" rust-version = "1.61" [dependencies] -pest = { path = "../pest", version = "2.7.5" } -pest_meta = { path = "../meta", version = "2.7.5" } -pest_vm = { path = "../vm", version = "2.7.5" } +pest = { path = "../pest", version = "2.7.6" } +pest_meta = { path = "../meta", version = "2.7.6" } +pest_vm = { path = "../vm", version = "2.7.6" } reqwest = { version = "= 0.11.13", default-features = false, features = ["blocking", "json", "default-tls"] } rustyline = "10" serde_json = "1" diff --git a/derive/Cargo.toml b/derive/Cargo.toml index 4d6741ab..c4897b59 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.5" +version = "2.7.6" 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.5", default-features = false } -pest_generator = { path = "../generator", version = "2.7.5", default-features = false } +pest = { path = "../pest", version = "2.7.6", default-features = false } +pest_generator = { path = "../generator", version = "2.7.6", default-features = false } diff --git a/generator/Cargo.toml b/generator/Cargo.toml index a7fad628..0bdf4bd4 100644 --- a/generator/Cargo.toml +++ b/generator/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "pest_generator" description = "pest code generator" -version = "2.7.5" +version = "2.7.6" edition = "2021" authors = ["Dragoș Tiselice "] homepage = "https://pest.rs/" @@ -20,8 +20,8 @@ not-bootstrap-in-src = ["pest_meta/not-bootstrap-in-src"] grammar-extras = ["pest_meta/grammar-extras"] [dependencies] -pest = { path = "../pest", version = "2.7.5", default-features = false } -pest_meta = { path = "../meta", version = "2.7.5" } +pest = { path = "../pest", version = "2.7.6", default-features = false } +pest_meta = { path = "../meta", version = "2.7.6" } proc-macro2 = "1.0" quote = "1.0" syn = "2.0" diff --git a/grammars/Cargo.toml b/grammars/Cargo.toml index 294c62f9..861c3eba 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.5" +version = "2.7.6" 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.5" } -pest_derive = { path = "../derive", version = "2.7.5" } +pest = { path = "../pest", version = "2.7.6" } +pest_derive = { path = "../derive", version = "2.7.6" } [dev-dependencies] criterion = "0.5" diff --git a/meta/Cargo.toml b/meta/Cargo.toml index 30a79722..8eaf42a6 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.5" +version = "2.7.6" edition = "2021" authors = ["Dragoș Tiselice "] homepage = "https://pest.rs/" @@ -16,7 +16,7 @@ include = ["Cargo.toml", "src/**/*", "src/grammar.rs", "_README.md", "LICENSE-*" rust-version = "1.61" [dependencies] -pest = { path = "../pest", version = "2.7.5" } +pest = { path = "../pest", version = "2.7.6" } once_cell = "1.8.0" [build-dependencies] diff --git a/meta/build.rs b/meta/build.rs index 1be4e6c1..92eb97df 100644 --- a/meta/build.rs +++ b/meta/build.rs @@ -17,7 +17,11 @@ use std::path::{Path, PathBuf}; use std::process::Command; fn display_digest(digest: &[u8]) -> String { - digest.iter().map(|byte| format!("{:02x}", byte)).collect() + use std::fmt::Write; + digest.iter().fold(String::new(), |mut output, b| { + let _ = write!(output, "{b:02x}"); + output + }) } fn main() { diff --git a/pest/Cargo.toml b/pest/Cargo.toml index 7cd35bb3..9473a639 100644 --- a/pest/Cargo.toml +++ b/pest/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "pest" description = "The Elegant Parser" -version = "2.7.5" +version = "2.7.6" edition = "2021" authors = ["Dragoș Tiselice "] homepage = "https://pest.rs/" diff --git a/pest/tests/json.rs b/pest/tests/json.rs index be64057f..0313d81b 100644 --- a/pest/tests/json.rs +++ b/pest/tests/json.rs @@ -457,7 +457,7 @@ fn ast() { let vals: Vec<&Json> = pairs.values().collect(); assert_eq!( - **vals.get(0).unwrap(), + **vals.first().unwrap(), Json::Array(vec![Json::Null, Json::Bool(true), Json::Number(3.4)]) ); } diff --git a/semvercheck.sh b/semvercheck.sh index df3748b9..f7d933c4 100755 --- a/semvercheck.sh +++ b/semvercheck.sh @@ -8,7 +8,7 @@ cargo run --package pest_bootstrap # current for crate in "pest_derive" "pest_generator" "pest_grammars" "pest_meta" "pest" "pest_vm" "pest_debugger"; do - cargo +nightly-2023-03-20 rustdoc -p $crate -- $RUSTDOC_LATE_FLAGS + cargo +nightly-2023-12-31 rustdoc -p $crate -- $RUSTDOC_LATE_FLAGS mv target/doc/$crate.json /tmp/current-$crate.json done @@ -21,7 +21,7 @@ cargo clean cargo build --package pest_bootstrap cargo run --package pest_bootstrap for crate in "pest_derive" "pest_generator" "pest_grammars" "pest_meta" "pest" "pest_vm" "pest_debugger"; do - cargo +nightly-2023-03-20 rustdoc -p $crate -- $RUSTDOC_LATE_FLAGS + cargo +nightly-2023-12-31 rustdoc -p $crate -- $RUSTDOC_LATE_FLAGS mv target/doc/$crate.json /tmp/baseline-$crate.json echo "Checking $crate" cargo semver-checks check-release --current /tmp/current-$crate.json --baseline /tmp/baseline-$crate.json diff --git a/vm/Cargo.toml b/vm/Cargo.toml index d88688a4..820f032f 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.5" +version = "2.7.6" 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.5" } -pest_meta = { path = "../meta", version = "2.7.5" } +pest = { path = "../pest", version = "2.7.6" } +pest_meta = { path = "../meta", version = "2.7.6" } [features] grammar-extras = ["pest_meta/grammar-extras"]