From 4b459b8c9ea018ef5d075e4fae41b88c0f5b2b95 Mon Sep 17 00:00:00 2001 From: Tomas Tauber <2410580+tomtau@users.noreply.github.com> Date: Mon, 12 Feb 2024 15:43:20 +0800 Subject: [PATCH 1/4] ci: bump toolchain for check --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bb861dcd..5e3333b4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: uses: ./.github/actions/setup with: kind: check - toolchain: 1.70.0 + 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 From c996b70d5208ff9f7b8ba04ec6fb029b21f42449 Mon Sep 17 00:00:00 2001 From: Tomas Tauber <2410580+tomtau@users.noreply.github.com> Date: Mon, 12 Feb 2024 15:47:53 +0800 Subject: [PATCH 2/4] bump more pipeline toolchains --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5e3333b4..04abff93 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,7 @@ jobs: with: kind: check components: clippy, rustfmt - toolchain: 1.70.0 + toolchain: 1.74.0 # needed for `clap` in pest_debugger - name: cargo fmt run: cargo fmt --all -- --check - name: cargo clippy @@ -62,7 +62,7 @@ jobs: id: setup with: kind: check - toolchain: 1.70.0 + 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 @@ -123,7 +123,7 @@ jobs: id: setup with: kind: check - toolchain: 1.70.0 + toolchain: 1.74.0 # needed for `clap` in pest_debugger - name: Check feature powerset run: cargo hack check --feature-powerset --optional-deps --exclude-all-features --skip not-bootstrap-in-src,cargo --keep-going --lib --tests --ignore-private From 0752c7bd3a5bec155eaec60d98f9e6de3534ad7e Mon Sep 17 00:00:00 2001 From: Tomas Tauber <2410580+tomtau@users.noreply.github.com> Date: Mon, 12 Feb 2024 15:54:06 +0800 Subject: [PATCH 3/4] allow the existing partial_cmp --- pest/src/position.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/pest/src/position.rs b/pest/src/position.rs index 465ff976..274555ad 100644 --- a/pest/src/position.rs +++ b/pest/src/position.rs @@ -463,6 +463,7 @@ impl<'i> PartialEq for Position<'i> { impl<'i> Eq for Position<'i> {} +#[allow(clippy::non-canonical-partial-ord-impl)] impl<'i> PartialOrd for Position<'i> { fn partial_cmp(&self, other: &Position<'i>) -> Option { if ptr::eq(self.input, other.input) { From 20077f717ad260e5a73928afcdeb4be138d9f2dd Mon Sep 17 00:00:00 2001 From: Tomas Tauber <2410580+tomtau@users.noreply.github.com> Date: Mon, 12 Feb 2024 16:00:40 +0800 Subject: [PATCH 4/4] fix `-` to `_` --- pest/src/position.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pest/src/position.rs b/pest/src/position.rs index 274555ad..3b1b6e7f 100644 --- a/pest/src/position.rs +++ b/pest/src/position.rs @@ -463,7 +463,7 @@ impl<'i> PartialEq for Position<'i> { impl<'i> Eq for Position<'i> {} -#[allow(clippy::non-canonical-partial-ord-impl)] +#[allow(clippy::non_canonical_partial_ord_impl)] impl<'i> PartialOrd for Position<'i> { fn partial_cmp(&self, other: &Position<'i>) -> Option { if ptr::eq(self.input, other.input) {