Skip to content
Permalink
Browse files

mach: always call `ensure_bootstrapped` before `call_rustup_run`

  • Loading branch information
SimonSapin committed Jan 2, 2020
1 parent e96bcea commit 6f70a9c1de649ce38e014eaa8fa3b22f862768a9
Showing with 2 additions and 1 deletion.
  1. +1 −1 python/servo/command_base.py
  2. +1 −0 python/servo/testing_commands.py
@@ -360,7 +360,7 @@ def rust_toolchain(self):

def call_rustup_run(self, args, **kwargs):
if self.config["tools"]["use-rustup"]:
self.ensure_rustup_version()
assert self.context.bootstrapped
args = ["rustup" + BIN_SUFFIX, "run", "--install", self.rust_toolchain()] + args
else:
args[0] += BIN_SUFFIX
@@ -310,6 +310,7 @@ def test_content(self):
return 0

def install_rustfmt(self):
self.ensure_bootstrapped()
with open(os.devnull, "w") as devnull:
if self.call_rustup_run(["cargo", "fmt", "--version", "-q"],
stderr=devnull) != 0:

0 comments on commit 6f70a9c

Please sign in to comment.
You can’t perform that action at this time.