diff --git a/.github/workflows/queue_and_merge.yml b/.github/workflows/queue_and_merge.yml index abd4ee13e..c2fe2cb84 100644 --- a/.github/workflows/queue_and_merge.yml +++ b/.github/workflows/queue_and_merge.yml @@ -99,7 +99,7 @@ jobs: repo-token: ${{ secrets.GITHUB_TOKEN }} - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: nightly-2024-06-14-x86_64-unknown-linux-gnu + toolchain: nightly-2024-06-14 cache: true - run: just fmt-check diff --git a/justfile b/justfile index 0c5215375..7f01a764d 100644 --- a/justfile +++ b/justfile @@ -1,3 +1,7 @@ +devs: + rustup toolchain install 1.79.0 --no-self-update --component clippy,rustfmt + rustup toolchain install nightly-2024-06-14 --no-self-update --component clippy,rustfmt + build: cargo build --all @@ -5,10 +9,10 @@ check: cargo check --all fmt: - cargo +nightly fmt --all + cargo +nightly-2024-06-14 fmt --all fmt-check: - cargo +nightly fmt --all --check + cargo +nightly-2024-06-14 fmt --all --check test: cargo test diff --git a/orm/src/validators.rs b/orm/src/validators.rs index 309d095d1..79027c0dc 100644 --- a/orm/src/validators.rs +++ b/orm/src/validators.rs @@ -140,10 +140,10 @@ pub fn validator_sort_by( order: OrderByDb, ) -> Box< dyn BoxableExpression< - validators::table, - diesel::pg::Pg, - SqlType = NotSelectable, - >, + validators::table, + diesel::pg::Pg, + SqlType = NotSelectable, + >, > { match validator_sort_by { ValidatorSortByDb::VotingPower => {