From 127867a9daefc757a89598e1bc504fa70977da70 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Sat, 30 Nov 2024 13:55:16 +1100 Subject: [PATCH] gha: fix cargofmt checks to use nightly Signed-off-by: Aleksa Sarai --- .github/workflows/rust.yml | 3 ++- src/capi/error.rs | 3 ++- src/tests/test_resolve_partial.rs | 7 +++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 6923814d..d027756a 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -146,7 +146,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable + # We need to use nightly Rust to check the formatting. + - uses: dtolnay/rust-toolchain@nightly with: components: rustfmt - run: cargo fmt --all -- --check diff --git a/src/capi/error.rs b/src/capi/error.rs index 6c3de4a0..85e9a4c7 100644 --- a/src/capi/error.rs +++ b/src/capi/error.rs @@ -34,7 +34,8 @@ use libc::{c_char, c_int}; use once_cell::sync::Lazy; use rand::{self, Rng}; -// TODO: Switch this to using a slab or similar structure, possibly using a less heavy-weight lock? +// TODO: Switch this to using a slab or similar structure, possibly using a less +// heavy-weight lock? // MSRV(1.80): Use LazyLock. static ERROR_MAP: Lazy>> = Lazy::new(|| Mutex::new(HashMap::new())); diff --git a/src/tests/test_resolve_partial.rs b/src/tests/test_resolve_partial.rs index a6aa8731..8c9569bc 100644 --- a/src/tests/test_resolve_partial.rs +++ b/src/tests/test_resolve_partial.rs @@ -18,8 +18,11 @@ */ use crate::{ - error::ErrorKind, flags::ResolverFlags, resolvers::PartialLookup, resolvers::ResolverBackend, - tests::common as tests_common, Root, + error::ErrorKind, + flags::ResolverFlags, + resolvers::{PartialLookup, ResolverBackend}, + tests::common as tests_common, + Root, }; use anyhow::Error;