Stop depending on rustc_jobserver::Client

Author: Mark-Simulacrum

src/librustc_codegen_ssa/back/write.rs

@@ -30,7 +30,7 @@ use rustc_target::spec::MergeFunctions;
 use syntax::attr;
 use syntax_pos::hygiene::ExpnId;
 use syntax_pos::symbol::{Symbol, sym};
-use rustc_jobserver::{Client, Acquired};
+use rustc_jobserver::Acquired;
 
 use std::any::Any;
 use std::fs;
@@ -432,7 +432,6 @@ pub fn start_async_codegen<B: ExtraBackendMethods>(
                                                   codegen_worker_send,
                                                   coordinator_receive,
                                                   total_cgus,
-                                                  rustc_jobserver::client(),
                                                   Arc::new(modules_config),
                                                   Arc::new(metadata_config),
                                                   Arc::new(allocator_config),
@@ -937,7 +936,6 @@ fn start_executing_work<B: ExtraBackendMethods>(
     codegen_worker_send: Sender<Message<B>>,
     coordinator_receive: Receiver<Box<dyn Any + Send>>,
     total_cgus: usize,
-    jobserver: Client,
     modules_config: Arc<ModuleConfig>,
     metadata_config: Arc<ModuleConfig>,
     allocator_config: Arc<ModuleConfig>,
@@ -980,7 +978,7 @@ fn start_executing_work<B: ExtraBackendMethods>(
     // get tokens on `coordinator_receive` which will
     // get managed in the main loop below.
     let coordinator_send2 = coordinator_send.clone();
-    let helper = jobserver.into_helper_thread(move |token| {
+    let helper = rustc_jobserver::client().into_helper_thread(move |token| {
         let token = token.expect("acquired token successfully");
         drop(coordinator_send2.send(Box::new(Message::Token::<B>(token))));
     }).expect("failed to spawn helper thread");