From 0bb4546af42bc7be9f0ccf269ee9c1184dffd2d7 Mon Sep 17 00:00:00 2001 From: Jason Ish Date: Fri, 18 Nov 2022 08:59:11 -0600 Subject: [PATCH] setup-app-layer: rustfmt new rust files --- scripts/setup-app-layer.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/scripts/setup-app-layer.py b/scripts/setup-app-layer.py index 80847a7320..ef5fcbac43 100755 --- a/scripts/setup-app-layer.py +++ b/scripts/setup-app-layer.py @@ -9,6 +9,7 @@ import argparse import io import re import datetime +import subprocess YEAR = datetime.date.today().year @@ -21,6 +22,13 @@ class SetupError(Exception): progname = os.path.basename(sys.argv[0]) +def rustfmt(filename): + print("Formatting {}".format(filename)) + try: + subprocess.run(["rustfmt", filename]) + except Exception as err: + print("ERROR: Failed to run rustfmt on {}: {}".format(filename, err)) + def fail_if_exists(filename): if os.path.exists(filename): raise SetupError("%s already exists" % (filename)) @@ -64,6 +72,9 @@ def common_copy_templates(proto, pairs, replacements=()): output.write(line) output.close() + if dst.endswith(".rs"): + rustfmt(dst) + def copy_app_layer_templates(proto): lower = proto.lower() upper = proto.upper() @@ -103,6 +114,7 @@ def patch_rust_applayer_mod_rs(protoname): done = True output.write(line) open(filename, "w").write(output.getvalue()) + rustfmt(filename) def patch_app_layer_protos_h(protoname): filename = "src/app-layer-protos.h"