diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-10-02 03:16:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-02 03:16:40 +0200 |
| commit | c6d4421e965aa7a955c8f63c5bd97a47eb86f3aa (patch) | |
| tree | 2302715625f8fd96b1913b8dcb37313dceb8c558 | |
| parent | 3d71ff48d22ddf35ac4fe221cb67b5a8aa74d2a9 (diff) | |
| parent | 8bba0de693a3279b00eb682775e490c8bf3fef6d (diff) | |
| download | rust-c6d4421e965aa7a955c8f63c5bd97a47eb86f3aa.tar.gz rust-c6d4421e965aa7a955c8f63c5bd97a47eb86f3aa.zip | |
Rollup merge of #102557 - Joshument:master, r=jyn514
fix issue with x.py setup running into explicit panic Fixes problem with [Issue #102555](https://github.com/rust-lang/rust/issues/102555) causing `x.py` setup to fail. Simply requires `rustfmt` be downloaded a little later.
| -rw-r--r-- | src/bootstrap/lib.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index 4ce09c7eec7..d5bba76e47f 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -656,8 +656,6 @@ impl Build { job::setup(self); } - // Download rustfmt early so that it can be used in rust-analyzer configs. - let _ = &builder::Builder::new(&self).initial_rustfmt(); self.maybe_update_submodules(); if let Subcommand::Format { check, paths } = &self.config.cmd { @@ -672,6 +670,9 @@ impl Build { return setup::setup(&self.config, *profile); } + // Download rustfmt early so that it can be used in rust-analyzer configs. + let _ = &builder::Builder::new(&self).initial_rustfmt(); + { let builder = builder::Builder::new(&self); if let Some(path) = builder.paths.get(0) { |