Enforce Item granularity

.github/workflows/ci.yml

@@ -23,10 +23,10 @@ jobs:
     steps:
       - uses: actions/checkout@v5
 
-      - uses: dtolnay/rust-toolchain@v1
+      - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
-          components: rustfmt, clippy
+          components: clippy
 
       # Make sure we test with recent deps
       - run: cargo update
@@ -44,13 +44,24 @@ jobs:
     steps:
       - uses: actions/checkout@v5
 
-      - uses: dtolnay/rust-toolchain@v1
+      - uses: dtolnay/rust-toolchain@1.74
         with:
           toolchain: "1.70"
 
       # Test everything except experimental features.
       - run: cargo test --features backtraces,lock_api,parking_lot
 
+  formatting:
+    name: Formatting
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+      # Use nightly formatting options
+      - uses: dtolnay/rust-toolchain@nightly
+        with:
+          components: rustfmt
+      - run: cargo fmt --check
+
   docs:
     name: Documentation build
     runs-on: ubuntu-latest
@@ -58,9 +69,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
 
-      - uses: dtolnay/rust-toolchain@v1
-        with:
-          toolchain: nightly
+      - uses: dtolnay/rust-toolchain@nightly
 
       - name: Build documentation
         env:

rustfmt.toml

@@ -1 +1,2 @@
 style_edition="2024"
+imports_granularity="Item"

src/parkinglot.rs

@@ -47,6 +47,8 @@ pub use parking_lot::WaitTimeoutResult;
 
 pub mod tracing;
 
+// Skip reformatting the combined imports as it duplicates the guards
+#[rustfmt::skip]
 #[cfg(debug_assertions)]
 pub use tracing::{
     FairMutex, FairMutexGuard, MappedFairMutexGuard, MappedMutexGuard, MappedReentrantMutexGuard,
@@ -56,6 +58,7 @@ pub use tracing::{
     const_reentrant_mutex, const_rwlock,
 };
 
+#[rustfmt::skip]
 #[cfg(not(debug_assertions))]
 pub use parking_lot::{
     FairMutex, FairMutexGuard, MappedFairMutexGuard, MappedMutexGuard, MappedReentrantMutexGuard,

src/stdsync.rs

@@ -20,11 +20,14 @@
 //! ```
 pub use std::sync as raw;
 
+// Skip reformatting the combined imports as it duplicates the guards
+#[rustfmt::skip]
 #[cfg(not(debug_assertions))]
 pub use std::sync::{
     Condvar, Mutex, MutexGuard, Once, OnceLock, RwLock, RwLockReadGuard, RwLockWriteGuard,
 };
 
+#[rustfmt::skip]
 #[cfg(debug_assertions)]
 pub use tracing::{
     Condvar, Mutex, MutexGuard, Once, OnceLock, RwLock, RwLockReadGuard, RwLockWriteGuard,