Merge pull request RustPython#5627 from youknowone/once-cell

Replace direct use of once_cell to std

Author: coolreader18

Cargo.lock

@@ -14,7 +14,6 @@ rustpython-compiler-core = { workspace = true }
 rustpython-doc = { workspace = true }
 
 itertools = { workspace = true }
-once_cell = { workspace = true }
 syn = { workspace = true, features = ["full", "extra-traits"] }
 
 maplit = "1.0.2"

derive-impl/Cargo.toml

@@ -14,10 +14,10 @@
 //! ```
 
 use crate::Diagnostic;
-use once_cell::sync::Lazy;
 use proc_macro2::{Span, TokenStream};
 use quote::quote;
 use rustpython_compiler_core::{Mode, bytecode::CodeObject, frozen};
+use std::sync::LazyLock;
 use std::{
     collections::HashMap,
     env, fs,
@@ -29,7 +29,7 @@ use syn::{
     spanned::Spanned,
 };
 
-static CARGO_MANIFEST_DIR: Lazy<PathBuf> = Lazy::new(|| {
+static CARGO_MANIFEST_DIR: LazyLock<PathBuf> = LazyLock::new(|| {
     PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR is not present"))
 });
 

derive-impl/src/compile_bytecode.rs

@@ -40,7 +40,6 @@ malachite-bigint = { workspace = true }
 num-integer = { workspace = true }
 num-traits = { workspace = true }
 num_enum = { workspace = true }
-once_cell = { workspace = true }
 parking_lot = { workspace = true }
 thread_local = { workspace = true }
 

stdlib/Cargo.toml

@@ -33,7 +33,7 @@ mod _contextvars {
     };
     use crossbeam_utils::atomic::AtomicCell;
     use indexmap::IndexMap;
-    use once_cell::sync::Lazy;
+    use std::sync::LazyLock;
     use std::{
         cell::{Cell, RefCell, UnsafeCell},
         sync::atomic::Ordering,
@@ -274,7 +274,7 @@ mod _contextvars {
 
     impl AsSequence for PyContext {
         fn as_sequence() -> &'static PySequenceMethods {
-            static AS_SEQUENCE: Lazy<PySequenceMethods> = Lazy::new(|| PySequenceMethods {
+            static AS_SEQUENCE: LazyLock<PySequenceMethods> = LazyLock::new(|| PySequenceMethods {
                 contains: atomic_func!(|seq, target, vm| {
                     let target = target.try_to_value(vm)?;
                     PyContext::sequence_downcast(seq).contains(target)

stdlib/src/contextvars.rs

@@ -12,9 +12,9 @@ mod _csv {
     };
     use csv_core::Terminator;
     use itertools::{self, Itertools};
-    use once_cell::sync::Lazy;
     use parking_lot::Mutex;
     use rustpython_vm::match_class;
+    use std::sync::LazyLock;
     use std::{collections::HashMap, fmt};
 
     #[pyattr]
@@ -41,11 +41,11 @@ mod _csv {
         )
     }
 
-    static GLOBAL_HASHMAP: Lazy<Mutex<HashMap<String, PyDialect>>> = Lazy::new(|| {
+    static GLOBAL_HASHMAP: LazyLock<Mutex<HashMap<String, PyDialect>>> = LazyLock::new(|| {
         let m = HashMap::new();
         Mutex::new(m)
     });
-    static GLOBAL_FIELD_LIMIT: Lazy<Mutex<isize>> = Lazy::new(|| Mutex::new(131072));
+    static GLOBAL_FIELD_LIMIT: LazyLock<Mutex<isize>> = LazyLock::new(|| Mutex::new(131072));
 
     fn new_csv_error(vm: &VirtualMachine, msg: String) -> PyBaseExceptionRef {
         vm.new_exception_msg(super::_csv::error(vm), msg)

stdlib/src/csv.rs

@@ -457,8 +457,8 @@ mod mmap {
 
     impl AsSequence for PyMmap {
         fn as_sequence() -> &'static PySequenceMethods {
-            use once_cell::sync::Lazy;
-            static AS_SEQUENCE: Lazy<PySequenceMethods> = Lazy::new(|| PySequenceMethods {
+            use std::sync::LazyLock;
+            static AS_SEQUENCE: LazyLock<PySequenceMethods> = LazyLock::new(|| PySequenceMethods {
                 length: atomic_func!(|seq, _vm| Ok(PyMmap::sequence_downcast(seq).len())),
                 item: atomic_func!(|seq, i, vm| {
                     let zelf = PyMmap::sequence_downcast(seq);

stdlib/src/mmap.rs

@@ -1953,8 +1953,8 @@ mod _sqlite {
 
     impl AsMapping for Row {
         fn as_mapping() -> &'static PyMappingMethods {
-            static AS_MAPPING: once_cell::sync::Lazy<PyMappingMethods> =
-                once_cell::sync::Lazy::new(|| PyMappingMethods {
+            static AS_MAPPING: std::sync::LazyLock<PyMappingMethods> =
+                std::sync::LazyLock::new(|| PyMappingMethods {
                     length: atomic_func!(|mapping, _vm| Ok(Row::mapping_downcast(mapping)
                         .data
                         .len())),
@@ -1969,8 +1969,8 @@ mod _sqlite {
 
     impl AsSequence for Row {
         fn as_sequence() -> &'static PySequenceMethods {
-            static AS_SEQUENCE: once_cell::sync::Lazy<PySequenceMethods> =
-                once_cell::sync::Lazy::new(|| PySequenceMethods {
+            static AS_SEQUENCE: std::sync::LazyLock<PySequenceMethods> =
+                std::sync::LazyLock::new(|| PySequenceMethods {
                     length: atomic_func!(|seq, _vm| Ok(Row::sequence_downcast(seq).data.len())),
                     item: atomic_func!(|seq, i, vm| Row::sequence_downcast(seq)
                         .data

stdlib/src/sqlite.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)

stdlib/src/uuid.rs

@@ -27,7 +27,7 @@ use crate::{
     },
 };
 use bstr::ByteSlice;
-use once_cell::sync::Lazy;
+use std::sync::LazyLock;
 use std::{mem::size_of, ops::Deref};
 
 #[pyclass(module = false, name = "bytes")]
@@ -568,7 +568,7 @@ impl AsBuffer for PyBytes {
 
 impl AsMapping for PyBytes {
     fn as_mapping() -> &'static PyMappingMethods {
-        static AS_MAPPING: Lazy<PyMappingMethods> = Lazy::new(|| PyMappingMethods {
+        static AS_MAPPING: LazyLock<PyMappingMethods> = LazyLock::new(|| PyMappingMethods {
             length: atomic_func!(|mapping, _vm| Ok(PyBytes::mapping_downcast(mapping).len())),
             subscript: atomic_func!(
                 |mapping, needle, vm| PyBytes::mapping_downcast(mapping)._getitem(needle, vm)
@@ -581,7 +581,7 @@ impl AsMapping for PyBytes {
 
 impl AsSequence for PyBytes {
     fn as_sequence() -> &'static PySequenceMethods {
-        static AS_SEQUENCE: Lazy<PySequenceMethods> = Lazy::new(|| PySequenceMethods {
+        static AS_SEQUENCE: LazyLock<PySequenceMethods> = LazyLock::new(|| PySequenceMethods {
             length: atomic_func!(|seq, _vm| Ok(PyBytes::sequence_downcast(seq).len())),
             concat: atomic_func!(|seq, other, vm| {
                 PyBytes::sequence_downcast(seq)