Skip to content

Commit

Permalink
bump versions + minor clippy fixes (#959)
Browse files Browse the repository at this point in the history
  • Loading branch information
tomtau authored Jan 4, 2024
1 parent 6ea9523 commit d16266a
Show file tree
Hide file tree
Showing 11 changed files with 29 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions debugger/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>", "Tomas Tauber <[email protected]>"]
homepage = "https://pest.rs/"
Expand All @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions derive/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"]
homepage = "https://pest.rs/"
Expand All @@ -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 }
6 changes: 3 additions & 3 deletions generator/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"]
homepage = "https://pest.rs/"
Expand All @@ -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"
6 changes: 3 additions & 3 deletions grammars/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"]
homepage = "https://pest.rs/"
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions meta/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"]
homepage = "https://pest.rs/"
Expand All @@ -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]
Expand Down
6 changes: 5 additions & 1 deletion meta/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion pest/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "pest"
description = "The Elegant Parser"
version = "2.7.5"
version = "2.7.6"
edition = "2021"
authors = ["Dragoș Tiselice <[email protected]>"]
homepage = "https://pest.rs/"
Expand Down
2 changes: 1 addition & 1 deletion pest/tests/json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)])
);
}
Expand Down
4 changes: 2 additions & 2 deletions semvercheck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions vm/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"]
homepage = "https://pest.rs/"
Expand All @@ -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"]

0 comments on commit d16266a

Please sign in to comment.