refactor: use Lazy for PyNumberMethod static

Author: discord9

Cargo.lock

@@ -26,6 +26,7 @@ use crate::{
     TryFromBorrowedObject, TryFromObject, VirtualMachine,
 };
 use bstr::ByteSlice;
+use once_cell::sync::Lazy;
 use std::{mem::size_of, ops::Deref};
 
 #[pyclass(module = false, name = "bytes")]
@@ -610,14 +611,14 @@ impl AsSequence for PyBytes {
 
 impl AsNumber for PyBytes {
     fn as_number() -> &'static PyNumberMethods {
-        static AS_NUMBER: PyNumberMethods = PyNumberMethods {
+        static AS_NUMBER: Lazy<PyNumberMethods> = Lazy::new(|| PyNumberMethods {
             remainder: atomic_func!(|number, other, vm| {
                 PyBytes::number_downcast(number)
                     .mod_(other.to_owned(), vm)
                     .to_pyresult(vm)
             }),
             ..PyNumberMethods::NOT_IMPLEMENTED
-        };
+        });
         &AS_NUMBER
     }
 }

vm/src/builtins/bytes.rs

@@ -15,6 +15,7 @@ use crate::{
 };
 use num_complex::Complex64;
 use num_traits::Zero;
+use once_cell::sync::Lazy;
 use rustpython_common::{float_ops, hash};
 use std::num::Wrapping;
 
@@ -447,7 +448,7 @@ impl Hashable for PyComplex {
 
 impl AsNumber for PyComplex {
     fn as_number() -> &'static PyNumberMethods {
-        static AS_NUMBER: PyNumberMethods = PyNumberMethods {
+        static AS_NUMBER: Lazy<PyNumberMethods> = Lazy::new(|| PyNumberMethods {
             add: atomic_func!(|number, other, vm| PyComplex::number_complex_op(
                 number,
                 other,
@@ -481,7 +482,7 @@ impl AsNumber for PyComplex {
                 PyComplex::number_general_op(number, other, inner_div, vm)
             }),
             ..PyNumberMethods::NOT_IMPLEMENTED
-        };
+        });
         &AS_NUMBER
     }
 }

vm/src/builtins/complex.rs

@@ -21,6 +21,7 @@ use num_bigint::{BigInt, ToBigInt};
 use num_complex::Complex64;
 use num_rational::Ratio;
 use num_traits::{Signed, ToPrimitive, Zero};
+use once_cell::sync::Lazy;
 
 /// Convert a string or number to a floating point number, if possible.
 #[pyclass(module = false, name = "float")]
@@ -549,7 +550,7 @@ impl Hashable for PyFloat {
 
 impl AsNumber for PyFloat {
     fn as_number() -> &'static PyNumberMethods {
-        static AS_NUMBER: PyNumberMethods = PyNumberMethods {
+        static AS_NUMBER: Lazy<PyNumberMethods> = Lazy::new(|| PyNumberMethods {
             add: atomic_func!(|num, other, vm| PyFloat::number_float_op(
                 num,
                 other,
@@ -602,7 +603,7 @@ impl AsNumber for PyFloat {
                 PyFloat::number_general_op(num, other, inner_div, vm)
             }),
             ..PyNumberMethods::NOT_IMPLEMENTED
-        };
+        });
         &AS_NUMBER
     }
 }

vm/src/builtins/float.rs

@@ -19,6 +19,7 @@ use bstr::ByteSlice;
 use num_bigint::{BigInt, BigUint, Sign};
 use num_integer::Integer;
 use num_traits::{One, Pow, PrimInt, Signed, ToPrimitive, Zero};
+use once_cell::sync::Lazy;
 use std::ops::Neg;
 use std::{fmt, ops::Not};
 
@@ -756,7 +757,7 @@ impl Hashable for PyInt {
 
 impl AsNumber for PyInt {
     fn as_number() -> &'static PyNumberMethods {
-        static AS_NUMBER: PyNumberMethods = PyNumberMethods {
+        static AS_NUMBER: Lazy<PyNumberMethods> = Lazy::new(|| PyNumberMethods {
             add: atomic_func!(|num, other, vm| PyInt::number_int_op(num, other, |a, b| a + b, vm)),
             subtract: atomic_func!(|num, other, vm| PyInt::number_int_op(
                 num,
@@ -822,7 +823,7 @@ impl AsNumber for PyInt {
             }),
             index: atomic_func!(|num, vm| Ok(PyInt::number_int(num, vm))),
             ..PyNumberMethods::NOT_IMPLEMENTED
-        };
+        });
         &AS_NUMBER
     }
 }

vm/src/builtins/int.rs

@@ -1,3 +1,5 @@
+use once_cell::sync::Lazy;
+
 use super::{PyDict, PyDictRef, PyGenericAlias, PyList, PyTuple, PyType, PyTypeRef};
 use crate::{
     atomic_func,
@@ -219,15 +221,15 @@ impl AsSequence for PyMappingProxy {
 
 impl AsNumber for PyMappingProxy {
     fn as_number() -> &'static PyNumberMethods {
-        static AS_NUMBER: PyNumberMethods = PyNumberMethods {
+        static AS_NUMBER: Lazy<PyNumberMethods> = Lazy::new(|| PyNumberMethods {
             or: atomic_func!(|num, args, vm| {
                 PyMappingProxy::number_downcast(num).or(args.to_pyobject(vm), vm)
             }),
             inplace_or: atomic_func!(|num, args, vm| {
                 PyMappingProxy::number_downcast(num).ior(args.to_pyobject(vm), vm)
             }),
             ..PyNumberMethods::NOT_IMPLEMENTED
-        };
+        });
         &AS_NUMBER
     }
 }

vm/src/builtins/mappingproxy.rs

@@ -1,3 +1,5 @@
+use once_cell::sync::Lazy;
+
 use super::{PyType, PyTypeRef};
 use crate::{
     atomic_func,
@@ -58,10 +60,10 @@ impl PyNone {
 
 impl AsNumber for PyNone {
     fn as_number() -> &'static PyNumberMethods {
-        static AS_NUMBER: PyNumberMethods = PyNumberMethods {
+        static AS_NUMBER: Lazy<PyNumberMethods> = Lazy::new(|| PyNumberMethods {
             boolean: atomic_func!(|_number, _vm| Ok(false)),
             ..PyNumberMethods::NOT_IMPLEMENTED
-        };
+        });
         &AS_NUMBER
     }
 }