From c8a86cdffa1dbd5ab0e3db9a381b8f806508d04e Mon Sep 17 00:00:00 2001
From: Philippe Antoine <pantoine@oisf.net>
Date: Tue, 2 Jun 2026 13:07:37 +0200
Subject: [PATCH] ci: move rustfmt to a helper script

---
 .github/workflows/builds.yml | 22 +------------------
 scripts/rustfmt.sh           | 42 ++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 21 deletions(-)
 create mode 100755 scripts/rustfmt.sh

diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index a8f24b7600..f17f99963c 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -380,21 +380,7 @@ jobs:
       # especially without debug feature
       - run: cargo clippy
         working-directory: rust
-      - run: cargo fmt --check
-        working-directory: rust/suricatactl
-      - run: cargo fmt --check
-        working-directory: rust/suricatasc
-      - run: cargo fmt --check
-        working-directory: rust/sys
-      - run: cargo fmt --check
-        working-directory: rust/derive
-      - run: rustfmt --check rust/src/dns/*.rs rust/src/applayertemplate/*.rs rust/src/asn1/*.rs
-              rust/src/bittorrent_dht/*.rs rust/src/enip/*.rs rust/src/ffi/*.rs rust/src/ftp/*.rs
-              rust/src/ldap/*.rs rust/src/mime/*.rs rust/src/ntp/*.rs rust/src/quic/*.rs
-              rust/src/rfb/*.rs rust/src/ssh/*.rs rust/src/utils/*.rs rust/src/websocket/*.rs
-              rust/src/dhcp/*.rs rust/src/krb/*.rs rust/src/mdns/*.rs rust/src/pop3/*.rs
-              rust/src/http2/*.rs rust/src/ike/*.rs rust/src/modbus/*.rs rust/src/mqtt/*.rs
-              rust/src/nfs/*.rs rust/src/pgsql/*.rs
+      - run: ./scripts/rustfmt.sh
       - name: Check if Cargo.lock.in is up to date
         run: |
           cp rust/Cargo.lock rust/Cargo.lock.in
@@ -404,12 +390,6 @@ jobs:
               echo "::error ::Cargo.lock.in needs to be updated"
               exit 1
           fi
-      # does not work in other subdirectories for now
-      - run: cargo fmt --check
-        working-directory: rust/htp
-      # The ffi crate is cargo fmt clean.
-      - run: cargo fmt --check
-        working-directory: rust/ffi
 
       - run: make -j ${{ env.CPUS }} distcheck
         env:
diff --git a/scripts/rustfmt.sh b/scripts/rustfmt.sh
new file mode 100755
index 0000000000..f9144a7225
--- /dev/null
+++ b/scripts/rustfmt.sh
@@ -0,0 +1,42 @@
+#! /usr/bin/env bash
+# Check rust formatting, not complete yet
+
+set -e
+
+(
+cd rust/derive
+cargo fmt --check
+)
+
+(
+cd rust/htp
+cargo fmt --check
+)
+
+(
+cd rust/ffi
+cargo fmt --check
+)
+
+(
+cd rust/suricatactl
+cargo fmt --check
+)
+
+(
+cd rust/suricatasc
+cargo fmt --check
+)
+
+(
+cd rust/sys
+cargo fmt --check
+)
+
+rustfmt --check rust/src/dns/*.rs rust/src/applayertemplate/*.rs rust/src/asn1/*.rs \
+    rust/src/bittorrent_dht/*.rs rust/src/enip/*.rs rust/src/ffi/*.rs rust/src/ftp/*.rs \
+    rust/src/ldap/*.rs rust/src/mime/*.rs rust/src/ntp/*.rs rust/src/quic/*.rs \
+    rust/src/rfb/*.rs rust/src/ssh/*.rs rust/src/utils/*.rs rust/src/websocket/*.rs \
+    rust/src/dhcp/*.rs rust/src/krb/*.rs rust/src/mdns/*.rs rust/src/pop3/*.rs \
+    rust/src/http2/*.rs rust/src/ike/*.rs rust/src/modbus/*.rs rust/src/mqtt/*.rs \
+    rust/src/nfs/*.rs rust/src/pgsql/*.rs