From 5cd138eb0ca98d71a8a1397aebadce2255e4454b Mon Sep 17 00:00:00 2001 From: Philippe Antoine Date: Tue, 20 Jun 2023 09:39:25 +0200 Subject: [PATCH] ci: check rustfmt Files formatted need to remain formatted --- .github/workflows/formatting.yml | 1 + qa/rustfmt.sh | 10 +++++++ qa/rustfmt.txt | 50 ++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+) create mode 100644 qa/rustfmt.sh create mode 100644 qa/rustfmt.txt diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml index 4c17fecc8685..e1cde82ad147 100644 --- a/.github/workflows/formatting.yml +++ b/.github/workflows/formatting.yml @@ -126,6 +126,7 @@ jobs: fi shell: bash {0} - run: git clone https://github.com/OISF/libhtp -b 0.5.x + - run: ./qa/rustfmt.sh - run: ./autogen.sh - run: ./configure --enable-unittests - name: Check formatting diff --git a/qa/rustfmt.sh b/qa/rustfmt.sh new file mode 100644 index 000000000000..e5346f74ebfa --- /dev/null +++ b/qa/rustfmt.sh @@ -0,0 +1,10 @@ +r=0 +cat qa/rustfmt.txt | while read i; do + rustfmt $i; + if [ $(git diff | wc -l) -gt 0 ]; then + git diff; + echo "$i" needs to be formatted + r=1; + fi +done +exit $r diff --git a/qa/rustfmt.txt b/qa/rustfmt.txt new file mode 100644 index 000000000000..a7f9f2ab43a4 --- /dev/null +++ b/qa/rustfmt.txt @@ -0,0 +1,50 @@ +rust/derive/src/applayerframetype.rs +rust/src/detect/error.rs +rust/src/detect/iprep.rs +rust/src/detect/uint.rs +rust/src/detect/uri.rs +rust/src/detect/parser.rs +rust/src/detect/stream_size.rs +rust/src/ftp/event.rs +rust/src/ftp/mod.rs +rust/src/bittorrent_dht/logger.rs +rust/src/bittorrent_dht/parser.rs +rust/src/dcerpc/detect.rs +rust/src/util.rs +rust/src/applayertemplate/logger.rs +rust/src/applayertemplate/parser.rs +rust/src/jsonbuilder.rs +rust/src/lzma.rs +rust/src/rdp/util.rs +rust/src/rdp/error.rs +rust/src/rdp/windows.rs +rust/src/rfb/rfb.rs +rust/src/http2/huffman.rs +rust/src/x509/log.rs +rust/src/x509/time.rs +rust/src/ike/logger.rs +rust/src/ike/detect.rs +rust/src/ffi/strings.rs +rust/src/dhcp/detect.rs +rust/src/dhcp/parser.rs +rust/src/pgsql/logger.rs +rust/src/smb/ntlmssp_records.rs +rust/src/smb/events.rs +rust/src/smb/error.rs +rust/src/smb/smb2_records.rs +rust/src/sip/parser.rs +rust/src/mqtt/logger.rs +rust/src/mqtt/mqtt_message.rs +rust/src/mqtt/mqtt_property.rs +rust/src/plugin.rs +rust/src/dns/lua.rs +rust/src/dns/parser.rs +rust/src/modbus/log.rs +rust/src/modbus/detect.rs +rust/src/quic/logger.rs +rust/src/quic/error.rs +rust/src/quic/detect.rs +rust/src/quic/parser.rs +rust/src/quic/cyu.rs +rust/src/quic/crypto.rs +rust/src/common.rs