From 8bba0de693a3279b00eb682775e490c8bf3fef6d Mon Sep 17 00:00:00 2001
From: Joshument <74075169+Joshument@users.noreply.github.com>
Date: Sat, 1 Oct 2022 18:51:10 -0400
Subject: [PATCH] fix issue with x.py setup running into explicit panic

---
 src/bootstrap/lib.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index cb18e14fa36d6..d8ae517cfefc1 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -654,8 +654,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 {
@@ -670,6 +668,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) {