IntoPyRef to vm::function

Author: youknowone

stdlib/src/zlib.rs

@@ -5,8 +5,8 @@ mod zlib {
     use crate::common::lock::PyMutex;
     use crate::vm::{
         builtins::{PyBaseExceptionRef, PyBytes, PyBytesRef, PyIntRef, PyTypeRef},
-        function::{ArgBytesLike, OptionalArg, OptionalOption},
-        IntoPyRef, PyResult, PyValue, VirtualMachine,
+        function::{ArgBytesLike, IntoPyRef, OptionalArg, OptionalOption},
+        PyResult, PyValue, VirtualMachine,
     };
     use adler32::RollingAdler32 as Adler32;
     use crossbeam_utils::atomic::AtomicCell;

vm/src/builtins/range.rs

@@ -2,15 +2,15 @@ use super::{PyInt, PyIntRef, PySlice, PyTupleRef, PyTypeRef};
 use crate::common::hash::PyHash;
 use crate::{
     builtins::builtins_iter,
-    function::{FuncArgs, OptionalArg},
+    function::{FuncArgs, IntoPyRef, OptionalArg},
     protocol::{PyIterReturn, PyMappingMethods, PySequenceMethods},
     pyclass::PyClassImpl,
     types::{
         AsMapping, AsSequence, Comparable, Constructor, Hashable, IterNext, IterNextIterable,
         Iterable, PyComparisonOp, Unconstructible,
     },
-    IdProtocol, IntoPyRef, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue,
-    TryFromObject, TypeProtocol, VirtualMachine,
+    IdProtocol, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject,
+    TypeProtocol, VirtualMachine,
 };
 use crossbeam_utils::atomic::AtomicCell;
 use num_bigint::{BigInt, Sign};

vm/src/function.rs

@@ -4,8 +4,8 @@ mod number;
 
 use crate::{
     builtins::{PyBaseExceptionRef, PyTupleRef, PyTypeRef},
-    PyObject, PyObjectRef, PyRef, PyResult, PyThreadingConstraint, PyValue, TryFromObject,
-    TypeProtocol, VirtualMachine,
+    PyObject, PyObjectPayload, PyObjectRef, PyRef, PyResult, PyThreadingConstraint, PyValue,
+    TryFromObject, TypeProtocol, VirtualMachine,
 };
 use indexmap::IndexMap;
 use itertools::Itertools;
@@ -28,6 +28,10 @@ pub trait IntoPyResult {
     fn into_pyresult(self, vm: &VirtualMachine) -> PyResult;
 }
 
+pub trait IntoPyRef<T: PyObjectPayload> {
+    fn into_pyref(self, vm: &VirtualMachine) -> PyRef<T>;
+}
+
 pub trait IntoPyException {
     fn into_pyexception(self, vm: &VirtualMachine) -> PyBaseExceptionRef;
 }

vm/src/lib.rs

@@ -88,8 +88,8 @@ pub use self::ops::{PyArithmeticValue, PyComparisonValue};
 
 // pyobject
 pub use self::pyobject::{
-    IdProtocol, IntoPyRef, PyAttributes, PyContext, PyLease, PyMethod, PyObjectPayload, PyRefExact,
-    PyResult, PyStructSequence, PyThreadingConstraint, PyValue, TypeProtocol,
+    IdProtocol, PyAttributes, PyContext, PyLease, PyMethod, PyObjectPayload, PyRefExact, PyResult,
+    PyStructSequence, PyThreadingConstraint, PyValue, TypeProtocol,
 };
 // pyobjectrc
 pub use self::pyobject::{

vm/src/pyobject.rs

@@ -14,7 +14,7 @@ use crate::{
     convert::TryFromObject,
     dictdatatype::Dict,
     exceptions,
-    function::{IntoFuncArgs, IntoPyNativeFunc, IntoPyObject, IntoPyResult},
+    function::{IntoFuncArgs, IntoPyNativeFunc, IntoPyObject, IntoPyRef, IntoPyResult},
     pyclass::{PyClassImpl, StaticType},
     types::{PyTypeFlags, PyTypeSlots, TypeZoo},
     VirtualMachine,
@@ -520,10 +520,6 @@ impl<T: TypeProtocol> TypeProtocol for &'_ T {
     }
 }
 
-pub trait IntoPyRef<T: PyObjectPayload> {
-    fn into_pyref(self, vm: &VirtualMachine) -> PyRef<T>;
-}
-
 impl<T, P> IntoPyRef<P> for T
 where
     P: PyValue + IntoPyObject + From<T>,

vm/src/stdlib/os.rs

@@ -434,14 +434,13 @@ pub(super) mod _os {
             PyBytesRef, PyGenericAlias, PyIntRef, PyStrRef, PyTuple, PyTupleRef, PyTypeRef,
         },
         crt_fd::{Fd, Offset},
-        function::{ArgBytesLike, FuncArgs, IntoPyException, IntoPyObject, OptionalArg},
+        function::{ArgBytesLike, FuncArgs, IntoPyException, IntoPyObject, IntoPyRef, OptionalArg},
         protocol::PyIterReturn,
         suppress_iph,
         types::{IterNext, IterNextIterable},
         utils::Either,
         vm::{ReprGuard, VirtualMachine},
-        IntoPyRef, PyObjectRef, PyRef, PyResult, PyStructSequence, PyValue, TryFromObject,
-        TypeProtocol,
+        PyObjectRef, PyRef, PyResult, PyStructSequence, PyValue, TryFromObject, TypeProtocol,
     };
     use crossbeam_utils::atomic::AtomicCell;
     use itertools::Itertools;