diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 9bdcade8eb2e..053546db54e9 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -624,10 +624,12 @@ jobs:
         uses: ./.github/actions/setup-builder
         with:
           rust-version: stable
-      - name: Run
+      - name: Setup nightly Rust toolchain
+        run: rustup toolchain install nightly --component rustfmt
+      - name: Run cargo fmt check (including doc comments)
         run: |
           echo '' > datafusion/proto/src/generated/datafusion.rs
-          ci/scripts/rust_fmt.sh
+          cargo +nightly fmt --all -- --check --config format_code_in_doc_comments=true
 
   # Coverage job disabled due to
   # https://github.com/apache/datafusion/issues/3678