ci: use fmt-check

anoma · Dec 17, 2024 · b6f52af · b6f52af
1 parent 3b80430
commit b6f52af
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git 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
@@ -1,14 +1,18 @@
+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
 
 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
@@ -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 => {