Skip to content

Commit

Permalink
Remove allow clippy lint and specify rust toolchain for CI
Browse files Browse the repository at this point in the history
  • Loading branch information
Johnabell committed Mar 27, 2024
1 parent 9af276e commit 15bf67c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
11 changes: 11 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Install latest nightly
uses: actions-rs/toolchain@v1
with:
toolchain: 1.58.0
override: true
components: rustfmt, clippy, doc
- uses: Swatinem/rust-cache@v2
- uses: taiki-e/install-action@cargo-make
- run: cargo make fmt-check
Expand All @@ -25,6 +31,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Install latest nightly
uses: actions-rs/toolchain@v1
with:
toolchain: 1.58.0
override: true
- uses: Swatinem/rust-cache@v2
- uses: taiki-e/install-action@cargo-make
- name: Add hosts entries
Expand Down
4 changes: 2 additions & 2 deletions src/store/postgres/event_store.rs
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@ where
.collect::<Result<Vec<StoreEvent<A::Event>>, Self::Error>>()?)
}

// Note: https://github.com/rust-lang/rust-clippy/issues/12281
#[allow(clippy::blocks_in_conditions)]
// Clippy introduced `blocks_in_conditions` lint. With certain version of rust and tracing this
// line throws an error see: https://github.com/rust-lang/rust-clippy/issues/12281
#[tracing::instrument(skip_all, fields(aggregate_id = % aggregate_state.id()), err)]
async fn persist(
&self,
Expand Down

0 comments on commit 15bf67c

Please sign in to comment.