Auto merge of rust-lang#13225 - ehuss:fix-jobserver-always, r=epage

`cargo fix`: always inherit the jobserver

rust-lang#12951 changed `cargo fix` to ensure that `rustc` has access to the jobserver. However, it only did that for the final "verification" step. It was not set for any of the previous calls to rustc (which is up to ~5 calls).

I'm not sure if this was done intentionally, I did not see any discussion of this in rust-lang#12951.

This isn't too important in the grand scheme of things, because `rustc` is not doing codegen, so the parallel behavior is currently not used. However, this removes an extraneous `warning: failed to connect to jobserver from environment variable` warning that is printed in cargo's log every time it runs rustc. It also might be relevant in the future if rustc enables the parallel frontend.

Author: bors

src/cargo/ops/fix.rs

@@ -379,6 +379,11 @@ pub fn fix_exec_rustc(config: &Config, lock_addr: &str) -> CargoResult<()> {
     rustc.retry_with_argfile(true);
     rustc.env_remove(FIX_ENV_INTERNAL);
     args.apply(&mut rustc);
+    // Removes `FD_CLOEXEC` set by `jobserver::Client` to ensure that the
+    // compiler can access the jobserver.
+    if let Some(client) = config.jobserver_from_env() {
+        rustc.inherit_jobserver(client);
+    }
 
     trace!("start rustfixing {:?}", args.file);
     let json_error_rustc = {
@@ -451,11 +456,6 @@ pub fn fix_exec_rustc(config: &Config, lock_addr: &str) -> CargoResult<()> {
         // things like colored output to work correctly.
         rustc.arg(arg);
     }
-    // Removes `FD_CLOEXEC` set by `jobserver::Client` to pass jobserver
-    // as environment variables specify.
-    if let Some(client) = config.jobserver_from_env() {
-        rustc.inherit_jobserver(client);
-    }
     debug!("calling rustc to display remaining diagnostics: {rustc}");
     exit_with(rustc.status()?);
 }