summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorRyan Dahl <ry@tinyclouds.org>2019-07-31 17:11:37 -0400
committerGitHub <noreply@github.com>2019-07-31 17:11:37 -0400
commit3971dcfe10b94e901a224b5328a9dafd1e2ecc08 (patch)
treee347644a90094774e56e9315119c31594ca60796 /tools
parentb3541c38f5672ffb4a29d66dca19d88b9ecae478 (diff)
Use system rustfmt instead of fixed binary (#2701)
Diffstat (limited to 'tools')
-rwxr-xr-xtools/format.py2
-rw-r--r--tools/gn.rs3
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/format.py b/tools/format.py
index 543cd4c07..c7465516a 100755
--- a/tools/format.py
+++ b/tools/format.py
@@ -61,7 +61,7 @@ def clang_format():
def rustfmt():
print "rustfmt"
qrun([
- "third_party/rustfmt/" + platform() + "/rustfmt",
+ "rustfmt",
"--config-path",
rustfmt_config,
] + find_exts(["cli", "core", "tools"], [".rs"]))
diff --git a/tools/gn.rs b/tools/gn.rs
index d43399fe9..ba1bea7bc 100644
--- a/tools/gn.rs
+++ b/tools/gn.rs
@@ -97,7 +97,8 @@ impl Build {
"third_party/python_packages/win32",
"third_party/python_packages/win32/lib",
"third_party/python_packages/Pythonwin",
- ].into_iter()
+ ]
+ .into_iter()
.map(|p| self.root.join(p).into_os_string().into_string().unwrap())
.collect();
let orig_path = String::from(";")