mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix issue with x.py setup running into explicit panic

Browse Source
This commit is contained in:
Joshument 2022-10-01 18:51:10 -04:00
parent 56a35bc906
commit 8bba0de693
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/bootstrap/lib.rs
View File

@ -654,8 +654,6 @@ impl Build {
job::setup(self); 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(); self.maybe_update_submodules();
if let Subcommand::Format { check, paths } = &self.config.cmd { if let Subcommand::Format { check, paths } = &self.config.cmd {
@ -670,6 +668,9 @@ impl Build {
return setup::setup(&self.config, *profile); 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); let builder = builder::Builder::new(&self);
if let Some(path) = builder.paths.get(0) { if let Some(path) = builder.paths.get(0) {