From a63906ffe95c8a89ba9bfd9bfd1570707eb6c69a Mon Sep 17 00:00:00 2001 From: Jiahao XU Date: Thu, 18 Apr 2024 20:36:11 +1000 Subject: [PATCH] Use `MaybeUninit::{assume_init_ref, write}` Since msrv is bumped to 1.63 Signed-off-by: Jiahao XU --- src/parallel/job_token.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/parallel/job_token.rs b/src/parallel/job_token.rs index 4fec982f8..17b2d47d8 100644 --- a/src/parallel/job_token.rs +++ b/src/parallel/job_token.rs @@ -34,6 +34,7 @@ impl JobTokenServer { /// that has to be static so that it will be shared by all cc /// compilation. fn new() -> &'static Self { + // TODO: Replace with a OnceLock once MSRV is 1.70 static INIT: Once = Once::new(); static mut JOBSERVER: MaybeUninit = MaybeUninit::uninit(); @@ -42,10 +43,9 @@ impl JobTokenServer { let server = inherited_jobserver::JobServer::from_env() .map(Self::Inherited) .unwrap_or_else(|| Self::InProcess(inprocess_jobserver::JobServer::new())); - JOBSERVER = MaybeUninit::new(server); + JOBSERVER.write(server); }); - // TODO: Poor man's assume_init_ref, as that'd require a MSRV of 1.55. - &*JOBSERVER.as_ptr() + JOBSERVER.assume_init_ref() } } }