diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-12-08 06:44:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-08 06:44:43 +0100 |
| commit | beabb5e2e30759a6613d0fb7eed5c79e70f71476 (patch) | |
| tree | 2f963815f910cd5522cb19eb855858ccd6492eed /compiler/rustc_data_structures/src | |
| parent | f7c892e3234829ff0f6e5b52ad1daf0c0be412a4 (diff) | |
| parent | dabedb711f13e14401e6be2f9a58a9bc1974a488 (diff) | |
| download | rust-beabb5e2e30759a6613d0fb7eed5c79e70f71476.tar.gz rust-beabb5e2e30759a6613d0fb7eed5c79e70f71476.zip | |
Rollup merge of #118709 - oksbsb:fix-job-server, r=SparrowLii
fix jobserver GLOBAL_CLIENT_CHECKED uninitialized before use override #118589, resolve merge conflict `@petrochenkov` `@SparrowLii` Thanks!
Diffstat (limited to 'compiler/rustc_data_structures/src')
| -rw-r--r-- | compiler/rustc_data_structures/src/jobserver.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_data_structures/src/jobserver.rs b/compiler/rustc_data_structures/src/jobserver.rs index b777bfd4d3c..412e33aaa65 100644 --- a/compiler/rustc_data_structures/src/jobserver.rs +++ b/compiler/rustc_data_structures/src/jobserver.rs @@ -52,7 +52,7 @@ fn default_client() -> Client { static GLOBAL_CLIENT_CHECKED: OnceLock<Client> = OnceLock::new(); -pub fn check(report_warning: impl FnOnce(&'static str)) { +pub fn initialize_checked(report_warning: impl FnOnce(&'static str)) { let client_checked = match &*GLOBAL_CLIENT { Ok(client) => client.clone(), Err(e) => { |