From c583a39e580f1a25e06b003c6764571c340cd018 Mon Sep 17 00:00:00 2001 From: Carlo Federico Vescovo Date: Fri, 12 Nov 2021 16:58:56 +0100 Subject: [PATCH 1/2] Fix Github actions workflow Do not test on 1.36; Use actions-rs/clippy-check for Clippy. --- .github/workflows/test.yml | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d759f7b5..ed51dc6c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,31 +7,39 @@ on: - "master" jobs: - format_and_lint: - name: Format and lint + format: + name: Format code runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Install latest nightly + - name: Install latest stable uses: actions-rs/toolchain@v1 with: toolchain: stable override: true - components: rustfmt, clippy + components: rustfmt - uses: Swatinem/rust-cache@v1 - - name: Check formating + - name: Check formatting run: cargo fmt -- --check - - name: Lint - run: cargo clippy -- -D warnings + clippy_check: + name: Clippy check + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: rustup component add clippy + - uses: actions-rs/clippy-check@v1 + with: + token: ${{ secrets.GITHUB_TOKEN }} + args: --all-features test: runs-on: ubuntu-latest strategy: matrix: - rust_version: [1.36.0, stable, beta, nightly] + rust_version: [stable, beta, nightly] fail-fast: false steps: - uses: actions/checkout@v2 - - name: Install latest nightly + - name: Install toolchain uses: actions-rs/toolchain@v1 with: toolchain: ${{matrix.rust_version}} From d5d2a9f38e3b26043bcd122b402d6d19de2c58ea Mon Sep 17 00:00:00 2001 From: CFV Date: Fri, 12 Nov 2021 18:08:41 +0100 Subject: [PATCH 2/2] Fix formatting --- src/node.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/node.rs b/src/node.rs index 3d6a716c..38b19ed5 100644 --- a/src/node.rs +++ b/src/node.rs @@ -229,7 +229,6 @@ impl fmt::Debug for Text { pub type Attributes = indexmap::IndexMap; /// A Map of attributes that doesn't preserve the order of the attributes. -/// /// Please enable the `deterministic` feature for order-preserving /// (de)serialization. #[cfg(not(feature = "deterministic"))]