Rollup merge of #102557 - Joshument:master, r=jyn514

matthiaskrgr · web-flow · commit c6d4421e965a · 2022-10-02T03:16:40.000+02:00
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.
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -656,8 +656,6 @@ impl Build {`
`656`	`656`	`job::setup(self);`
`657`	`657`	`}`
`658`	`658`
`659`		`- // Download rustfmt early so that it can be used in rust-analyzer configs.`
`660`		`- let _ = &builder::Builder::new(&self).initial_rustfmt();`
`661`	`659`	`self.maybe_update_submodules();`
`662`	`660`
`663`	`661`	`if let Subcommand::Format { check, paths } = &self.config.cmd {`
`@@ -672,6 +670,9 @@ impl Build {`
`672`	`670`	`return setup::setup(&self.config, *profile);`
`673`	`671`	`}`
`674`	`672`
	`673`	`+ // Download rustfmt early so that it can be used in rust-analyzer configs.`
	`674`	`+ let _ = &builder::Builder::new(&self).initial_rustfmt();`
	`675`	`+`
`675`	`676`	`{`
`676`	`677`	`let builder = builder::Builder::new(&self);`
`677`	`678`	`if let Some(path) = builder.paths.get(0) {`