Skip to content

Commit

Permalink
Rollup merge of #102557 - Joshument:master, r=jyn514
Browse files Browse the repository at this point in the history
fix issue with x.py setup running into explicit panic

Fixes problem with [Issue #102555](#102555) causing `x.py` setup to fail. Simply requires `rustfmt` be downloaded a little later.
  • Loading branch information
matthiaskrgr committed Oct 2, 2022
2 parents 3d71ff4 + 8bba0de commit c6d4421
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/bootstrap/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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) {
Expand Down

0 comments on commit c6d4421

Please sign in to comment.