Auto-rustfmt generated msg_targets

Author: tnull

.github/workflows/build.yml

@@ -176,14 +176,17 @@ jobs:
   fuzz:
     runs-on: ubuntu-latest
     env:
-      TOOLCHAIN: 1.63
+      TOOLCHAIN: 1.63.0
     steps:
       - name: Checkout source code
         uses: actions/checkout@v3
       - name: Install Rust ${{ env.TOOLCHAIN }} toolchain
         run: |
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile=minimal --default-toolchain ${{ env.TOOLCHAIN }}
           rustup override set ${{ env.TOOLCHAIN }}
+      - name: Install rustfmt
+        run: |
+          rustup component add rustfmt
       - name: Install dependencies for honggfuzz
         run: |
           sudo apt-get update

fuzz/src/bin/gen_target.sh

@@ -1,9 +1,17 @@
 #!/bin/sh
 
+RUSTFMT() {
+	VERS=""
+	[ "$(which rustup)" != "" ] && VERS="+1.63.0"
+
+	rustfmt "$VERS" -- "$1"
+}
+
 echo "#include <stdint.h>" > ../../targets.h
 GEN_TEST() {
-	cat target_template.txt | sed s/TARGET_NAME/$1/ | sed s/TARGET_MOD/$2$1/ > $1_target.rs
+	cat target_template.txt | sed s/TARGET_NAME/$1/ | sed s/TARGET_MOD/$2$1/ > "$1_target.rs"
 	echo "void $1_run(const unsigned char* data, size_t data_len);" >> ../../targets.h
+	RUSTFMT "$1_target.rs"
 }
 
 GEN_TEST bech32_parse

fuzz/src/msg_targets/gen_target.sh

@@ -1,13 +1,24 @@
 #!/bin/sh
 
+RUSTFMT() {
+	VERS=""
+	[ "$(which rustup)" != "" ] && VERS="+1.63.0"
+
+	rustfmt "$VERS" -- "$1"
+}
+
 GEN_TEST() {
 	tn=msg_$(echo $1 | sed s'/.*:://g' | sed 's/\([a-z0-9]\)\([A-Z]\)/\1_\2/g' | tr '[:upper:]' '[:lower:]')
 	fn=${tn}.rs
 	cat msg_target_template.txt | sed s/MSG_TARGET/$1/ | sed "s/TARGET_NAME/$tn/" | sed "s/TEST_MSG/$2/" | sed "s/EXTRA_ARGS/$3/" > $fn
+	RUSTFMT $fn
 	echo "pub mod $tn;" >> mod.rs
 }
 
-echo "mod utils;" > mod.rs
+{
+	echo "#[rustfmt::skip]"
+	echo "mod utils;"
+} > mod.rs
 
 # Note when adding new targets here you should add a similar line in src/bin/gen_target.sh
 
@@ -64,3 +75,5 @@ GEN_TEST lightning::ln::msgs::Stfu test_msg_simple ""
 GEN_TEST lightning::ln::msgs::Splice test_msg_simple ""
 GEN_TEST lightning::ln::msgs::SpliceAck test_msg_simple ""
 GEN_TEST lightning::ln::msgs::SpliceLocked test_msg_simple ""
+
+RUSTFMT mod.rs