OnceCell

youknowone · youknowone · commit 578a2c8fceee · 2025-12-09T05:12:52.000+09:00
diff --git a/crates/vm/src/exception_group.rs b/crates/vm/src/exception_group.rs
@@ -33,9 +33,10 @@ fn create_exception_group(ctx: &Context) -> PyRef<PyType> {
 }
 
 pub fn exception_group() -> &'static Py<PyType> {
-    static EXCEPTION_GROUP: std::sync::LazyLock<PyTypeRef> =
-        std::sync::LazyLock::new(|| create_exception_group(Context::genesis()));
-    EXCEPTION_GROUP.as_ref()
+    ::rustpython_vm::common::static_cell! {
+        static CELL: ::rustpython_vm::builtins::PyTypeRef;
+    }
+    CELL.get_or_init(|| create_exception_group(Context::genesis()))
 }
 
 pub(super) mod types {
@@ -253,7 +254,7 @@ pub(super) mod types {
                     let result = vm.call_method(&exc, "split", (condition.clone(),))?;
                     let result_tuple: PyTupleRef = result.try_into_value(vm)?;
                     let match_part = result_tuple
-                        .get(0)
+                        .first()
                         .cloned()
                         .unwrap_or_else(|| vm.ctx.none());
                     let rest_part = result_tuple
@@ -378,10 +379,10 @@ pub(super) mod types {
         vm: &VirtualMachine,
     ) -> PyResult<ConditionMatcher> {
         // If it's a type and subclass of BaseException
-        if let Some(typ) = condition.downcast_ref::<PyType>() {
-            if typ.fast_issubclass(vm.ctx.exceptions.base_exception_type) {
-                return Ok(ConditionMatcher::Type(typ.to_owned()));
-            }
+        if let Some(typ) = condition.downcast_ref::<PyType>()
+            && typ.fast_issubclass(vm.ctx.exceptions.base_exception_type)
+        {
+            return Ok(ConditionMatcher::Type(typ.to_owned()));
         }
 
         // If it's a tuple of types
@@ -456,11 +457,11 @@ pub(super) mod types {
         }
 
         // Copy notes (if present) - make a copy of the list
-        if let Ok(notes) = orig.as_object().get_attr("__notes__", vm) {
-            if let Some(notes_list) = notes.downcast_ref::<PyList>() {
-                let notes_copy = vm.ctx.new_list(notes_list.borrow_vec().to_vec());
-                new_group.set_attr("__notes__", notes_copy, vm)?;
-            }
+        if let Ok(notes) = orig.as_object().get_attr("__notes__", vm)
+            && let Some(notes_list) = notes.downcast_ref::<PyList>()
+        {
+            let notes_copy = vm.ctx.new_list(notes_list.borrow_vec().to_vec());
+            new_group.set_attr("__notes__", notes_copy, vm)?;
         }
 
         Ok(new_group)
diff --git a/crates/vm/src/vm/mod.rs b/crates/vm/src/vm/mod.rs
@@ -373,11 +373,11 @@ impl VirtualMachine {
             self.print_exception(e);
         }
 
-        let expect_stdlib =
+        let _expect_stdlib =
             cfg!(feature = "freeze-stdlib") || !self.state.settings.path_list.is_empty();
 
         #[cfg(feature = "encodings")]
-        if expect_stdlib {
+        if _expect_stdlib {
             if let Err(e) = self.import_encodings() {
                 eprintln!(
                     "encodings initialization failed. Only utf-8 encoding will be supported."
