From 791357115c0aa1e4f87f70c57327bc66928b5019 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Tue, 10 Jul 2018 19:18:30 -0400 Subject: Remove -f option from rustfmt. (#356) And add support for RUSTFMT_FLAGS (Some people might need -f option) --- tools/format.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/format.py b/tools/format.py index 40ca58d4c..d0d54e314 100755 --- a/tools/format.py +++ b/tools/format.py @@ -19,4 +19,10 @@ for fn in ["BUILD.gn", ".gn"] + glob("build_extra/**/*.gn*"): run(["yapf", "-i"] + glob("tools/*.py")) run(["node", prettier, "--write"] + glob("js/*.js") + glob("js/*.ts") + ["tsconfig.json"] + ["tslint.json"]) -run(["rustfmt", "-f", "--write-mode", "overwrite"] + glob("src/*.rs")) + +# Set RUSTFMT_FLAGS for extra flags. +rustfmt_extra_args = [] +if 'RUSTFMT_FLAGS' in os.environ: + rustfmt_extra_args += os.environ['RUSTFMT_FLAGS'].split() +run(["rustfmt", "--write-mode", "overwrite"] + rustfmt_extra_args + + glob("src/*.rs")) -- cgit v1.2.3