Remove more direct use of OnceCell

youknowone · youknowone · commit ad5788589bc5 · 2025-03-26T18:22:23.000+09:00
diff --git a/stdlib/src/uuid.rs b/stdlib/src/uuid.rs
@@ -4,7 +4,7 @@ pub(crate) use _uuid::make_module;
 mod _uuid {
     use crate::{builtins::PyNone, vm::VirtualMachine};
     use mac_address::get_mac_address;
-    use once_cell::sync::OnceCell;
+    use std::sync::OnceLock;
     use uuid::{Context, Uuid, timestamp::Timestamp};
 
     fn get_node_id() -> [u8; 6] {
@@ -19,7 +19,7 @@ mod _uuid {
         static CONTEXT: Context = Context::new(0);
         let ts = Timestamp::now(&CONTEXT);
 
-        static NODE_ID: OnceCell<[u8; 6]> = OnceCell::new();
+        static NODE_ID: OnceLock<[u8; 6]> = OnceLock::new();
         let unique_node_id = NODE_ID.get_or_init(get_node_id);
 
         (Uuid::new_v1(ts, unique_node_id).as_bytes().to_vec(), PyNone)
diff --git a/vm/src/vm/mod.rs b/vm/src/vm/mod.rs
@@ -107,8 +107,8 @@ pub struct PyGlobalState {
 }
 
 pub fn process_hash_secret_seed() -> u32 {
-    use once_cell::sync::OnceCell;
-    static SEED: OnceCell<u32> = OnceCell::new();
+    use std::sync::OnceLock;
+    static SEED: OnceLock<u32> = OnceLock::new();
     *SEED.get_or_init(rand::random)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -107,8 +107,8 @@ pub struct PyGlobalState {`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`pub fn process_hash_secret_seed() -> u32 {`
`110`		`- use once_cell::sync::OnceCell;`
`111`		`- static SEED: OnceCell<u32> = OnceCell::new();`
	`110`	`+ use std::sync::OnceLock;`
	`111`	`+ static SEED: OnceLock<u32> = OnceLock::new();`
`112`	`112`	`*SEED.get_or_init(rand::random)`
`113`	`113`	`}`
`114`	`114`