Remove -f option from rustfmt. (#356)

And add support for RUSTFMT_FLAGS (Some people might need -f option)

1 files changed, 7 insertions, 1 deletions

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"))