diff --git a/src/lib.rs b/src/lib.rs index 366df3b30..bc08a47e9 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -51,7 +51,7 @@ use rustpython_vm::{ compile, match_class, scope::Scope, stdlib::{atexit, sys}, - AsPyObject, InitParameter, Interpreter, PyObjectRef, PyResult, PySettings, TryFromObject, + AsObject, InitParameter, Interpreter, PyObjectRef, PyResult, PySettings, TryFromObject, VirtualMachine, }; use std::{env, path::Path, process, str::FromStr}; diff --git a/src/shell.rs b/src/shell.rs index 73288359c..3edb9434a 100644 --- a/src/shell.rs +++ b/src/shell.rs @@ -6,7 +6,7 @@ use rustpython_vm::{ builtins::PyBaseExceptionRef, compile::{self, CompileError, CompileErrorType}, scope::Scope, - AsPyObject, PyResult, VirtualMachine, + AsObject, PyResult, VirtualMachine, }; enum ShellExecResult { diff --git a/stdlib/src/array.rs b/stdlib/src/array.rs index 3a69bf081..6542f68f0 100644 --- a/stdlib/src/array.rs +++ b/stdlib/src/array.rs @@ -31,7 +31,7 @@ mod array { AsBuffer, AsMapping, Comparable, Constructor, IterNext, IterNextIterable, Iterable, PyComparisonOp, }, - AsPyObject, PyObject, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue, + AsObject, PyObject, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue, VirtualMachine, }, }; diff --git a/stdlib/src/csv.rs b/stdlib/src/csv.rs index 72954eff8..0a9367b94 100644 --- a/stdlib/src/csv.rs +++ b/stdlib/src/csv.rs @@ -16,7 +16,7 @@ mod _csv { match_class, protocol::{PyIter, PyIterReturn}, types::{IterNext, IterNextIterable}, - AsPyObject, PyObjectRef, PyObjectView, PyResult, PyValue, TryFromObject, VirtualMachine, + AsObject, PyObjectRef, PyObjectView, PyResult, PyValue, TryFromObject, VirtualMachine, }; use itertools::{self, Itertools}; use std::fmt; diff --git a/stdlib/src/json.rs b/stdlib/src/json.rs index bb663eb93..3b68d83ce 100644 --- a/stdlib/src/json.rs +++ b/stdlib/src/json.rs @@ -10,7 +10,7 @@ mod _json { function::OptionalArg, protocol::PyIterReturn, types::{Callable, Constructor}, - AsPyObject, PyObjectRef, PyObjectView, PyResult, PyValue, VirtualMachine, + AsObject, PyObjectRef, PyObjectView, PyResult, PyValue, VirtualMachine, }; use num_bigint::BigInt; use std::str::FromStr; diff --git a/stdlib/src/math.rs b/stdlib/src/math.rs index 17379f27b..5e2b0dd30 100644 --- a/stdlib/src/math.rs +++ b/stdlib/src/math.rs @@ -6,7 +6,7 @@ mod math { builtins::{try_bigint_to_f64, try_f64_to_bigint, PyFloat, PyInt, PyIntRef}, function::{ArgIntoFloat, ArgIterable, OptionalArg, PosArgs}, utils::Either, - AsPyObject, PyObject, PyObjectRef, PyRef, PyResult, VirtualMachine, + AsObject, PyObject, PyObjectRef, PyRef, PyResult, VirtualMachine, }; use num_bigint::BigInt; use num_traits::{One, Signed, Zero}; diff --git a/stdlib/src/pystruct.rs b/stdlib/src/pystruct.rs index da736f87e..1594d9c13 100644 --- a/stdlib/src/pystruct.rs +++ b/stdlib/src/pystruct.rs @@ -16,7 +16,7 @@ pub(crate) mod _struct { match_class, protocol::PyIterReturn, types::{Constructor, IterNext, IterNextIterable}, - AsPyObject, PyObjectRef, PyObjectView, PyResult, PyValue, TryFromObject, VirtualMachine, + AsObject, PyObjectRef, PyObjectView, PyResult, PyValue, TryFromObject, VirtualMachine, }; use crossbeam_utils::atomic::AtomicCell; diff --git a/stdlib/src/select.rs b/stdlib/src/select.rs index 360f0d6d4..058fa242d 100644 --- a/stdlib/src/select.rs +++ b/stdlib/src/select.rs @@ -261,7 +261,7 @@ mod decl { use super::*; use crate::vm::{ builtins::PyFloat, common::lock::PyMutex, convert::ToPyObject, function::OptionalArg, - stdlib::io::Fildes, AsPyObject, PyValue, + stdlib::io::Fildes, AsObject, PyValue, }; use libc::pollfd; use num_traits::ToPrimitive; diff --git a/stdlib/src/socket.rs b/stdlib/src/socket.rs index c8b3f873c..52cc33391 100644 --- a/stdlib/src/socket.rs +++ b/stdlib/src/socket.rs @@ -16,7 +16,7 @@ mod _socket { convert::{ToPyException, ToPyObject, TryFromBorrowedObject, TryFromObject}, function::{ArgBytesLike, ArgMemoryBuffer, FuncArgs, OptionalArg, OptionalOption}, utils::{Either, ToCString}, - AsPyObject, PyObjectRef, PyResult, PyValue, VirtualMachine, + AsObject, PyObjectRef, PyResult, PyValue, VirtualMachine, }; use crossbeam_utils::atomic::AtomicCell; use num_traits::ToPrimitive; diff --git a/vm/src/anystr.rs b/vm/src/anystr.rs index bcf209d69..4cd7a8f76 100644 --- a/vm/src/anystr.rs +++ b/vm/src/anystr.rs @@ -3,7 +3,7 @@ use crate::{ cformat::CFormatString, function::{single_or_tuple_any, OptionalOption}, protocol::PyIterIter, - AsPyObject, PyObjectRef, PyResult, TryFromObject, VirtualMachine, + AsObject, PyObjectRef, PyResult, TryFromObject, VirtualMachine, }; use num_traits::{cast::ToPrimitive, sign::Signed}; use std::str::FromStr; diff --git a/vm/src/builtins/asyncgenerator.rs b/vm/src/builtins/asyncgenerator.rs index 8ffed4ebd..389070e6c 100644 --- a/vm/src/builtins/asyncgenerator.rs +++ b/vm/src/builtins/asyncgenerator.rs @@ -7,7 +7,7 @@ use crate::{ protocol::PyIterReturn, pyclass::PyClassImpl, types::{Constructor, IterNext, IterNextIterable, Unconstructible}, - AsPyObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine, + AsObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine, }; use crossbeam_utils::atomic::AtomicCell; diff --git a/vm/src/builtins/builtinfunc.rs b/vm/src/builtins/builtinfunc.rs index af05e3619..d534c512f 100644 --- a/vm/src/builtins/builtinfunc.rs +++ b/vm/src/builtins/builtinfunc.rs @@ -4,7 +4,7 @@ use crate::{ function::{FuncArgs, IntoPyNativeFunc, PyNativeFunc}, pyclass::PyClassImpl, types::{Callable, Constructor, GetDescriptor, Unconstructible}, - AsPyObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine, + AsObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine, }; use std::fmt; diff --git a/vm/src/builtins/bytearray.rs b/vm/src/builtins/bytearray.rs index 92e9ba80d..792e5cf6c 100644 --- a/vm/src/builtins/bytearray.rs +++ b/vm/src/builtins/bytearray.rs @@ -33,7 +33,7 @@ use crate::{ IterNextIterable, Iterable, PyComparisonOp, Unconstructible, Unhashable, }, utils::Either, - AsPyObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyObjectWrap, PyRef, PyResult, + AsObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyObjectWrap, PyRef, PyResult, PyValue, TryFromBorrowedObject, TryFromObject, VirtualMachine, }; use bstr::ByteSlice; diff --git a/vm/src/builtins/bytes.rs b/vm/src/builtins/bytes.rs index 80467bea7..22b4ccc9d 100644 --- a/vm/src/builtins/bytes.rs +++ b/vm/src/builtins/bytes.rs @@ -20,7 +20,7 @@ use crate::{ IterNextIterable, Iterable, PyComparisonOp, Unconstructible, }, utils::Either, - AsPyObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyObjectWrap, PyRef, PyResult, + AsObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyObjectWrap, PyRef, PyResult, PyValue, TryFromBorrowedObject, TryFromObject, VirtualMachine, }; use bstr::ByteSlice; diff --git a/vm/src/builtins/classmethod.rs b/vm/src/builtins/classmethod.rs index 09e6c3a8e..ecbb4c0d1 100644 --- a/vm/src/builtins/classmethod.rs +++ b/vm/src/builtins/classmethod.rs @@ -3,7 +3,7 @@ use crate::{ builtins::PyBoundMethod, pyclass::PyClassImpl, types::{Constructor, GetDescriptor}, - AsPyObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine, + AsObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine, }; /// classmethod(function) -> method diff --git a/vm/src/builtins/code.rs b/vm/src/builtins/code.rs index 25c0d3a55..a3e46f1ac 100644 --- a/vm/src/builtins/code.rs +++ b/vm/src/builtins/code.rs @@ -7,7 +7,7 @@ use crate::{ bytecode::{self, BorrowedConstant, Constant, ConstantBag}, function::FuncArgs, pyclass::{PyClassImpl, StaticType}, - AsPyObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine, + AsObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine, }; use num_traits::Zero; use std::{fmt, ops::Deref}; diff --git a/vm/src/builtins/complex.rs b/vm/src/builtins/complex.rs index c49684edf..4032851ba 100644 --- a/vm/src/builtins/complex.rs +++ b/vm/src/builtins/complex.rs @@ -8,7 +8,7 @@ use crate::{ }, pyclass::PyClassImpl, types::{Comparable, Constructor, Hashable, PyComparisonOp}, - AsPyObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine, + AsObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine, }; use num_complex::Complex64; use num_traits::Zero; diff --git a/vm/src/builtins/coroutine.rs b/vm/src/builtins/coroutine.rs index c6859ba7d..dc46e966f 100644 --- a/vm/src/builtins/coroutine.rs +++ b/vm/src/builtins/coroutine.rs @@ -6,7 +6,7 @@ use crate::{ protocol::PyIterReturn, pyclass::PyClassImpl, types::{Constructor, IterNext, IterNextIterable, Unconstructible}, - AsPyObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine, + AsObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine, }; #[pyclass(module = false, name = "coroutine")] diff --git a/vm/src/builtins/dict.rs b/vm/src/builtins/dict.rs index 347983d5c..b84e6736b 100644 --- a/vm/src/builtins/dict.rs +++ b/vm/src/builtins/dict.rs @@ -21,7 +21,7 @@ use crate::{ IterNextIterable, Iterable, PyComparisonOp, Unconstructible, Unhashable, }, vm::{ReprGuard, VirtualMachine}, - AsPyObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue, + AsObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue, TryFromObject, }; use rustpython_common::lock::PyMutex; diff --git a/vm/src/builtins/enumerate.rs b/vm/src/builtins/enumerate.rs index f9e2abe53..3c6318c51 100644 --- a/vm/src/builtins/enumerate.rs +++ b/vm/src/builtins/enumerate.rs @@ -6,7 +6,7 @@ use crate::{ protocol::{PyIter, PyIterReturn}, pyclass::PyClassImpl, types::{Constructor, IterNext, IterNextIterable}, - AsPyObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine, + AsObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine, }; use num_bigint::BigInt; use num_traits::Zero; diff --git a/vm/src/builtins/float.rs b/vm/src/builtins/float.rs index 34785412b..c5fc2afde 100644 --- a/vm/src/builtins/float.rs +++ b/vm/src/builtins/float.rs @@ -10,7 +10,7 @@ use crate::{ }, pyclass::PyClassImpl, types::{Comparable, Constructor, Hashable, PyComparisonOp}, - AsPyObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, TryFromBorrowedObject, + AsObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, TryFromBorrowedObject, TryFromObject, VirtualMachine, }; use num_bigint::{BigInt, ToBigInt}; diff --git a/vm/src/builtins/frame.rs b/vm/src/builtins/frame.rs index c38b4c9b3..91676c68b 100644 --- a/vm/src/builtins/frame.rs +++ b/vm/src/builtins/frame.rs @@ -7,7 +7,7 @@ use crate::{ frame::{Frame, FrameRef}, pyclass::PyClassImpl, types::{Constructor, Unconstructible}, - AsPyObject, PyContext, PyObjectRef, PyObjectWrap, PyRef, PyResult, VirtualMachine, + AsObject, PyContext, PyObjectRef, PyObjectWrap, PyRef, PyResult, VirtualMachine, }; pub fn init(context: &PyContext) { diff --git a/vm/src/builtins/function.rs b/vm/src/builtins/function.rs index 934aa78ad..cde240ad3 100644 --- a/vm/src/builtins/function.rs +++ b/vm/src/builtins/function.rs @@ -14,7 +14,7 @@ use crate::{ pyclass::PyClassImpl, scope::Scope, types::{Callable, Comparable, Constructor, GetAttr, GetDescriptor, PyComparisonOp}, - AsPyObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine, + AsObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine, }; #[cfg(feature = "jit")] use crate::{common::lock::OnceCell, convert::ToPyObject}; diff --git a/vm/src/builtins/function/jitfunc.rs b/vm/src/builtins/function/jitfunc.rs index 1c299e519..a41c0e109 100644 --- a/vm/src/builtins/function/jitfunc.rs +++ b/vm/src/builtins/function/jitfunc.rs @@ -3,7 +3,7 @@ use crate::{ bytecode::CodeFlags, convert::ToPyObject, function::FuncArgs, - AsPyObject, PyObject, PyObjectRef, PyResult, TryFromObject, VirtualMachine, + AsObject, PyObject, PyObjectRef, PyResult, TryFromObject, VirtualMachine, }; use num_traits::ToPrimitive; use rustpython_jit::{AbiValue, Args, CompiledCode, JitArgumentError, JitType}; diff --git a/vm/src/builtins/generator.rs b/vm/src/builtins/generator.rs index 7528981b7..41f3e4ace 100644 --- a/vm/src/builtins/generator.rs +++ b/vm/src/builtins/generator.rs @@ -10,7 +10,7 @@ use crate::{ protocol::PyIterReturn, pyclass::PyClassImpl, types::{Constructor, IterNext, IterNextIterable, Unconstructible}, - AsPyObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine, + AsObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine, }; #[pyclass(module = false, name = "generator")] diff --git a/vm/src/builtins/genericalias.rs b/vm/src/builtins/genericalias.rs index 1e937013a..e3b81f8fc 100644 --- a/vm/src/builtins/genericalias.rs +++ b/vm/src/builtins/genericalias.rs @@ -6,7 +6,7 @@ use crate::{ protocol::PyMappingMethods, pyclass::PyClassImpl, types::{AsMapping, Callable, Comparable, Constructor, GetAttr, Hashable, PyComparisonOp}, - AsPyObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue, + AsObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue, TryFromObject, VirtualMachine, }; use std::fmt; diff --git a/vm/src/builtins/getset.rs b/vm/src/builtins/getset.rs index a78151904..935b4198b 100644 --- a/vm/src/builtins/getset.rs +++ b/vm/src/builtins/getset.rs @@ -8,7 +8,7 @@ use crate::{ pyclass::PyClassImpl, pyobject::PyThreadingConstraint, types::{Constructor, GetDescriptor, Unconstructible}, - AsPyObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject, VirtualMachine, + AsObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject, VirtualMachine, }; pub type PyGetterFunc = Box PyResult)>; diff --git a/vm/src/builtins/int.rs b/vm/src/builtins/int.rs index d32ddd03e..07c19b85f 100644 --- a/vm/src/builtins/int.rs +++ b/vm/src/builtins/int.rs @@ -7,7 +7,7 @@ use crate::{ function::{ArgIntoBool, OptionalArg, OptionalOption, PyArithmeticValue, PyComparisonValue}, pyclass::PyClassImpl, types::{Comparable, Constructor, Hashable, PyComparisonOp}, - AsPyObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, TryFromBorrowedObject, + AsObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, TryFromBorrowedObject, VirtualMachine, }; use bstr::ByteSlice; diff --git a/vm/src/builtins/list.rs b/vm/src/builtins/list.rs index 6977fe304..7f3f22626 100644 --- a/vm/src/builtins/list.rs +++ b/vm/src/builtins/list.rs @@ -16,7 +16,7 @@ use crate::{ }, utils::collection_repr, vm::{ReprGuard, VirtualMachine}, - AsPyObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyObjectWrap, PyRef, PyResult, + AsObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyObjectWrap, PyRef, PyResult, PyValue, }; use std::{borrow::Cow, fmt, ops::DerefMut}; diff --git a/vm/src/builtins/mappingproxy.rs b/vm/src/builtins/mappingproxy.rs index 1eb7d4684..c7404c576 100644 --- a/vm/src/builtins/mappingproxy.rs +++ b/vm/src/builtins/mappingproxy.rs @@ -7,7 +7,7 @@ use crate::{ protocol::{PyMapping, PyMappingMethods, PySequence, PySequenceMethods}, pyclass::PyClassImpl, types::{AsMapping, AsSequence, Constructor, Iterable}, - AsPyObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject, + AsObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject, VirtualMachine, }; diff --git a/vm/src/builtins/memory.rs b/vm/src/builtins/memory.rs index b8228c621..6b4c64f78 100644 --- a/vm/src/builtins/memory.rs +++ b/vm/src/builtins/memory.rs @@ -19,7 +19,7 @@ use crate::{ sliceable::wrap_index, types::{AsBuffer, AsMapping, AsSequence, Comparable, Constructor, Hashable, PyComparisonOp}, utils::Either, - AsPyObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyObjectWrap, PyRef, PyResult, + AsObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyObjectWrap, PyRef, PyResult, PyValue, TryFromBorrowedObject, TryFromObject, VirtualMachine, }; use crossbeam_utils::atomic::AtomicCell; diff --git a/vm/src/builtins/module.rs b/vm/src/builtins/module.rs index c199cdc72..15396d7d6 100644 --- a/vm/src/builtins/module.rs +++ b/vm/src/builtins/module.rs @@ -1,7 +1,7 @@ use super::pystr::IntoPyStrRef; use super::{PyDictRef, PyStr, PyStrRef, PyTypeRef}; use crate::{ - convert::ToPyObject, function::FuncArgs, pyclass::PyClassImpl, types::GetAttr, AsPyObject, + convert::ToPyObject, function::FuncArgs, pyclass::PyClassImpl, types::GetAttr, AsObject, PyContext, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue, VirtualMachine, }; diff --git a/vm/src/builtins/namespace.rs b/vm/src/builtins/namespace.rs index 441b60d46..85cae053a 100644 --- a/vm/src/builtins/namespace.rs +++ b/vm/src/builtins/namespace.rs @@ -5,7 +5,7 @@ use crate::{ pyclass::PyClassImpl, types::{Comparable, Constructor, PyComparisonOp}, vm::ReprGuard, - AsPyObject, PyContext, PyObject, PyRef, PyResult, PyValue, VirtualMachine, + AsObject, PyContext, PyObject, PyRef, PyResult, PyValue, VirtualMachine, }; /// A simple attribute-based namespace. diff --git a/vm/src/builtins/object.rs b/vm/src/builtins/object.rs index 71044ef7a..43d71acf3 100644 --- a/vm/src/builtins/object.rs +++ b/vm/src/builtins/object.rs @@ -5,7 +5,7 @@ use crate::{ pyclass::PyClassImpl, types::PyComparisonOp, utils::Either, - AsPyObject, PyContext, PyObject, PyObjectRef, PyResult, PyValue, VirtualMachine, + AsObject, PyContext, PyObject, PyObjectRef, PyResult, PyValue, VirtualMachine, }; /// object() diff --git a/vm/src/builtins/property.rs b/vm/src/builtins/property.rs index e21cb9ad9..1353e7f2e 100644 --- a/vm/src/builtins/property.rs +++ b/vm/src/builtins/property.rs @@ -4,7 +4,7 @@ use super::PyTypeRef; use crate::common::lock::PyRwLock; use crate::{ - function::FuncArgs, pyclass::PyClassImpl, types::GetDescriptor, AsPyObject, PyContext, + function::FuncArgs, pyclass::PyClassImpl, types::GetDescriptor, AsObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject, VirtualMachine, }; diff --git a/vm/src/builtins/pybool.rs b/vm/src/builtins/pybool.rs index a4e085028..d522b415c 100644 --- a/vm/src/builtins/pybool.rs +++ b/vm/src/builtins/pybool.rs @@ -1,8 +1,7 @@ use super::{PyInt, PyStrRef, PyTypeRef}; use crate::{ - convert::ToPyObject, function::OptionalArg, pyclass::PyClassImpl, types::Constructor, - AsPyObject, PyContext, PyObject, PyObjectRef, PyResult, PyValue, TryFromBorrowedObject, - VirtualMachine, + convert::ToPyObject, function::OptionalArg, pyclass::PyClassImpl, types::Constructor, AsObject, + PyContext, PyObject, PyObjectRef, PyResult, PyValue, TryFromBorrowedObject, VirtualMachine, }; use num_bigint::Sign; use num_traits::Zero; diff --git a/vm/src/builtins/pystr.rs b/vm/src/builtins/pystr.rs index 70935116e..b79a7b094 100644 --- a/vm/src/builtins/pystr.rs +++ b/vm/src/builtins/pystr.rs @@ -16,7 +16,7 @@ use crate::{ AsMapping, AsSequence, Comparable, Constructor, Hashable, IterNext, IterNextIterable, Iterable, PyComparisonOp, Unconstructible, }, - AsPyObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue, + AsObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue, TryFromBorrowedObject, VirtualMachine, }; use ascii::{AsciiStr, AsciiString}; diff --git a/vm/src/builtins/pysuper.rs b/vm/src/builtins/pysuper.rs index 31b9052f7..064a96ac2 100644 --- a/vm/src/builtins/pysuper.rs +++ b/vm/src/builtins/pysuper.rs @@ -8,7 +8,7 @@ use crate::{ function::OptionalArg, pyclass::PyClassImpl, types::{Constructor, GetAttr, GetDescriptor}, - AsPyObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine, + AsObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine, }; #[pyclass(module = false, name = "super")] diff --git a/vm/src/builtins/pytype.rs b/vm/src/builtins/pytype.rs index bb6f11c6d..a0eb3b3d2 100644 --- a/vm/src/builtins/pytype.rs +++ b/vm/src/builtins/pytype.rs @@ -11,7 +11,7 @@ use crate::{ function::{FuncArgs, KwArgs, OptionalArg}, pyclass::{PyClassImpl, StaticType}, types::{Callable, GetAttr, PyTypeFlags, PyTypeSlots, SetAttr}, - AsPyObject, PyContext, PyObjectRef, PyObjectWeak, PyRef, PyResult, PyValue, VirtualMachine, + AsObject, PyContext, PyObjectRef, PyObjectWeak, PyRef, PyResult, PyValue, VirtualMachine, }; use itertools::Itertools; use std::{ diff --git a/vm/src/builtins/pyunion.rs b/vm/src/builtins/pyunion.rs index 248a1415e..49390418b 100644 --- a/vm/src/builtins/pyunion.rs +++ b/vm/src/builtins/pyunion.rs @@ -7,7 +7,7 @@ use crate::{ protocol::PyMappingMethods, pyclass::PyClassImpl, types::{AsMapping, Comparable, GetAttr, Hashable, Iterable, PyComparisonOp}, - AsPyObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue, + AsObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue, TryFromObject, VirtualMachine, }; use std::fmt; diff --git a/vm/src/builtins/range.rs b/vm/src/builtins/range.rs index 79cb88b60..1e7936b18 100644 --- a/vm/src/builtins/range.rs +++ b/vm/src/builtins/range.rs @@ -9,7 +9,7 @@ use crate::{ AsMapping, AsSequence, Comparable, Constructor, Hashable, IterNext, IterNextIterable, Iterable, PyComparisonOp, Unconstructible, }, - AsPyObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue, + AsObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue, TryFromObject, VirtualMachine, }; use crossbeam_utils::atomic::AtomicCell; diff --git a/vm/src/builtins/set.rs b/vm/src/builtins/set.rs index 22c8a7667..4413a5b4f 100644 --- a/vm/src/builtins/set.rs +++ b/vm/src/builtins/set.rs @@ -17,7 +17,7 @@ use crate::{ }, utils::collection_repr, vm::{ReprGuard, VirtualMachine}, - AsPyObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject, + AsObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject, }; use std::borrow::Cow; use std::{fmt, ops::Deref}; diff --git a/vm/src/builtins/singletons.rs b/vm/src/builtins/singletons.rs index c7d4a53c3..131d6a740 100644 --- a/vm/src/builtins/singletons.rs +++ b/vm/src/builtins/singletons.rs @@ -1,6 +1,6 @@ use super::PyTypeRef; use crate::{ - convert::ToPyObject, pyclass::PyClassImpl, types::Constructor, AsPyObject, PyContext, + convert::ToPyObject, pyclass::PyClassImpl, types::Constructor, AsObject, PyContext, PyObjectRef, PyResult, PyValue, VirtualMachine, }; diff --git a/vm/src/builtins/slice.rs b/vm/src/builtins/slice.rs index c22980574..3ba125053 100644 --- a/vm/src/builtins/slice.rs +++ b/vm/src/builtins/slice.rs @@ -5,7 +5,7 @@ use crate::{ function::{FuncArgs, OptionalArg, PyComparisonValue}, pyclass::PyClassImpl, types::{Comparable, Constructor, Hashable, PyComparisonOp, Unhashable}, - AsPyObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine, + AsObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine, }; use num_bigint::{BigInt, ToBigInt}; use num_traits::{One, Signed, ToPrimitive, Zero}; diff --git a/vm/src/builtins/tuple.rs b/vm/src/builtins/tuple.rs index d52ff2faa..6aa60d28e 100644 --- a/vm/src/builtins/tuple.rs +++ b/vm/src/builtins/tuple.rs @@ -14,7 +14,7 @@ use crate::{ }, utils::collection_repr, vm::{ReprGuard, VirtualMachine}, - AsPyObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject, + AsObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject, }; use std::{borrow::Cow, fmt, marker::PhantomData}; diff --git a/vm/src/builtins/weakref.rs b/vm/src/builtins/weakref.rs index 0db91cb57..2425ec3f0 100644 --- a/vm/src/builtins/weakref.rs +++ b/vm/src/builtins/weakref.rs @@ -7,7 +7,7 @@ use crate::{ function::OptionalArg, pyclass::PyClassImpl, types::{Callable, Comparable, Constructor, Hashable, PyComparisonOp}, - AsPyObject, PyContext, PyObject, PyObjectRef, PyObjectWrap, PyRef, PyResult, PyValue, + AsObject, PyContext, PyObject, PyObjectRef, PyObjectWrap, PyRef, PyResult, PyValue, VirtualMachine, }; diff --git a/vm/src/builtins/zip.rs b/vm/src/builtins/zip.rs index 3e56514a3..fa63cbbb7 100644 --- a/vm/src/builtins/zip.rs +++ b/vm/src/builtins/zip.rs @@ -5,7 +5,7 @@ use crate::{ protocol::{PyIter, PyIterReturn}, pyclass::PyClassImpl, types::{Constructor, IterNext, IterNextIterable}, - AsPyObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject, VirtualMachine, + AsObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject, VirtualMachine, }; use rustpython_common::atomic::{self, PyAtomic, Radium}; diff --git a/vm/src/bytesinner.rs b/vm/src/bytesinner.rs index ed50c56f4..90d99ee04 100644 --- a/vm/src/bytesinner.rs +++ b/vm/src/bytesinner.rs @@ -9,7 +9,7 @@ use crate::{ sequence::{SequenceMutOp, SequenceOp}, types::PyComparisonOp, utils::Either, - AsPyObject, PyObject, PyObjectRef, PyResult, PyValue, TryFromBorrowedObject, VirtualMachine, + AsObject, PyObject, PyObjectRef, PyResult, PyValue, TryFromBorrowedObject, VirtualMachine, }; use bstr::ByteSlice; use itertools::Itertools; diff --git a/vm/src/cformat.rs b/vm/src/cformat.rs index 7c7e865ae..19a87ab2f 100644 --- a/vm/src/cformat.rs +++ b/vm/src/cformat.rs @@ -7,7 +7,7 @@ use crate::{ function::ArgIntoFloat, protocol::PyBuffer, stdlib::builtins, - AsPyObject, PyObjectRef, PyResult, TryFromBorrowedObject, TryFromObject, VirtualMachine, + AsObject, PyObjectRef, PyResult, TryFromBorrowedObject, TryFromObject, VirtualMachine, }; use itertools::Itertools; use num_bigint::{BigInt, Sign}; diff --git a/vm/src/codecs.rs b/vm/src/codecs.rs index 9b8b0f535..3794d0934 100644 --- a/vm/src/codecs.rs +++ b/vm/src/codecs.rs @@ -2,7 +2,7 @@ use crate::{ builtins::{PyBaseExceptionRef, PyBytesRef, PyStr, PyStrRef, PyTuple, PyTupleRef}, common::{ascii, lock::PyRwLock}, convert::ToPyObject, - AsPyObject, PyContext, PyObject, PyObjectRef, PyResult, PyValue, TryFromObject, VirtualMachine, + AsObject, PyContext, PyObject, PyObjectRef, PyResult, PyValue, TryFromObject, VirtualMachine, }; use std::{borrow::Cow, collections::HashMap, fmt::Write, ops::Range}; diff --git a/vm/src/convert/transmute_from.rs b/vm/src/convert/transmute_from.rs index e6c1eff7a..94e075939 100644 --- a/vm/src/convert/transmute_from.rs +++ b/vm/src/convert/transmute_from.rs @@ -1,5 +1,5 @@ use crate::{ - pyobject::{AsPyObject, PyObject, PyRef, PyResult, PyValue}, + pyobject::{AsObject, PyObject, PyRef, PyResult, PyValue}, vm::VirtualMachine, }; diff --git a/vm/src/convert/try_from.rs b/vm/src/convert/try_from.rs index 13b0f587f..6fd30b3a6 100644 --- a/vm/src/convert/try_from.rs +++ b/vm/src/convert/try_from.rs @@ -1,5 +1,5 @@ use crate::{ - pyobject::{AsPyObject, PyObject, PyObjectRef, PyRef, PyResult, PyValue}, + pyobject::{AsObject, PyObject, PyObjectRef, PyRef, PyResult, PyValue}, vm::VirtualMachine, }; diff --git a/vm/src/coroutine.rs b/vm/src/coroutine.rs index 4217b97ec..801fe5c83 100644 --- a/vm/src/coroutine.rs +++ b/vm/src/coroutine.rs @@ -3,7 +3,7 @@ use crate::{ common::lock::PyMutex, frame::{ExecutionResult, FrameRef}, protocol::PyIterReturn, - AsPyObject, PyObject, PyObjectRef, PyResult, VirtualMachine, + AsObject, PyObject, PyObjectRef, PyResult, VirtualMachine, }; use crossbeam_utils::atomic::AtomicCell; diff --git a/vm/src/dictdatatype.rs b/vm/src/dictdatatype.rs index 994cf8161..733ad57c1 100644 --- a/vm/src/dictdatatype.rs +++ b/vm/src/dictdatatype.rs @@ -10,7 +10,7 @@ use crate::common::{ use crate::{ builtins::{PyInt, PyStr, PyStrRef}, convert::ToPyObject, - AsPyObject, PyObject, PyObjectRef, PyRefExact, PyResult, VirtualMachine, + AsObject, PyObject, PyObjectRef, PyRefExact, PyResult, VirtualMachine, }; use num_traits::ToPrimitive; use std::{fmt, mem::size_of, ops::ControlFlow}; diff --git a/vm/src/exceptions.rs b/vm/src/exceptions.rs index 40d3ab278..5c4067a0d 100644 --- a/vm/src/exceptions.rs +++ b/vm/src/exceptions.rs @@ -10,7 +10,7 @@ use crate::{ pyclass::{PyClassImpl, StaticType}, stdlib::sys, suggestion::offer_suggestions, - AsPyObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject, VirtualMachine, + AsObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject, VirtualMachine, }; use crossbeam_utils::atomic::AtomicCell; use itertools::Itertools; diff --git a/vm/src/format.rs b/vm/src/format.rs index 38f4ebfa2..b26af0110 100644 --- a/vm/src/format.rs +++ b/vm/src/format.rs @@ -4,7 +4,7 @@ use crate::{ convert::ToPyException, function::FuncArgs, stdlib::builtins, - AsPyObject, PyObject, PyObjectRef, PyResult, VirtualMachine, + AsObject, PyObject, PyObjectRef, PyResult, VirtualMachine, }; use itertools::{Itertools, PeekingNext}; use num_bigint::{BigInt, Sign}; diff --git a/vm/src/frame.rs b/vm/src/frame.rs index 29d20fcee..b023ea90b 100644 --- a/vm/src/frame.rs +++ b/vm/src/frame.rs @@ -16,7 +16,7 @@ use crate::{ scope::Scope, stdlib::builtins, types::PyComparisonOp, - AsPyObject, PyMethod, PyObject, PyObjectRef, PyObjectWrap, PyRef, PyResult, PyValue, + AsObject, PyMethod, PyObject, PyObjectRef, PyObjectWrap, PyRef, PyResult, PyValue, TryFromObject, VirtualMachine, }; use indexmap::IndexMap; diff --git a/vm/src/function.rs b/vm/src/function.rs index 19ca84036..a7c9eea28 100644 --- a/vm/src/function.rs +++ b/vm/src/function.rs @@ -7,7 +7,7 @@ use crate::{ builtins::{PyBaseExceptionRef, PyTupleRef, PyTypeRef}, convert::{ToPyObject, ToPyResult}, pyobject::PyThreadingConstraint, - AsPyObject, PyObject, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject, VirtualMachine, + AsObject, PyObject, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject, VirtualMachine, }; use indexmap::IndexMap; use itertools::Itertools; diff --git a/vm/src/function/argument.rs b/vm/src/function/argument.rs index 0decb6f47..59693fff4 100644 --- a/vm/src/function/argument.rs +++ b/vm/src/function/argument.rs @@ -3,7 +3,7 @@ use crate::{ builtins::{iter::PySequenceIterator, PyDict, PyDictRef}, convert::ToPyObject, protocol::{PyIter, PyIterIter, PyMapping, PyMappingMethods}, - AsPyObject, PyObject, PyObjectRef, PyObjectWrap, PyResult, PyValue, TryFromObject, + AsObject, PyObject, PyObjectRef, PyObjectWrap, PyResult, PyValue, TryFromObject, VirtualMachine, }; use std::{borrow::Borrow, marker::PhantomData}; diff --git a/vm/src/function/arithmetic.rs b/vm/src/function/arithmetic.rs index 4229328c0..86dad0d29 100644 --- a/vm/src/function/arithmetic.rs +++ b/vm/src/function/arithmetic.rs @@ -1,6 +1,6 @@ use crate::{ convert::{ToPyObject, TryFromObject}, - pyobject::{AsPyObject, PyObjectRef, PyResult}, + pyobject::{AsObject, PyObjectRef, PyResult}, VirtualMachine, }; diff --git a/vm/src/function/number.rs b/vm/src/function/number.rs index 963680162..06f076715 100644 --- a/vm/src/function/number.rs +++ b/vm/src/function/number.rs @@ -1,4 +1,4 @@ -use crate::{AsPyObject, PyObjectRef, PyResult, TryFromObject, VirtualMachine}; +use crate::{AsObject, PyObjectRef, PyResult, TryFromObject, VirtualMachine}; use num_complex::Complex64; /// A Python complex-like object. diff --git a/vm/src/import.rs b/vm/src/import.rs index 14533434b..0b753d691 100644 --- a/vm/src/import.rs +++ b/vm/src/import.rs @@ -8,7 +8,7 @@ use crate::{ scope::Scope, version::get_git_revision, vm::{InitParameter, VirtualMachine}, - AsPyObject, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject, + AsObject, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject, }; use rand::Rng; diff --git a/vm/src/lib.rs b/vm/src/lib.rs index 702cc1f00..b1918ea28 100644 --- a/vm/src/lib.rs +++ b/vm/src/lib.rs @@ -89,7 +89,7 @@ mod pyobject { pub use self::convert::{TryFromBorrowedObject, TryFromObject}; // pyobject items pub use self::pyobject::{ - AsPyObject, PyContext, PyMethod, PyObjectWrap, PyRefExact, PyResult, PyStructSequence, PyValue, + AsObject, PyContext, PyMethod, PyObjectWrap, PyRefExact, PyResult, PyStructSequence, PyValue, }; // pyobjectrc items pub use self::pyobject::{PyObject, PyObjectRef, PyObjectView, PyObjectWeak, PyRef, PyWeakRef}; diff --git a/vm/src/macros.rs b/vm/src/macros.rs index 594568273..d1a2a8ba5 100644 --- a/vm/src/macros.rs +++ b/vm/src/macros.rs @@ -49,7 +49,7 @@ macro_rules! py_namespace { { let namespace = $crate::builtins::PyNamespace::new_ref(&$vm.ctx); $( - $vm.__module_set_attr($crate::pyobject::AsPyObject::as_object(&namespace), $name, $value).unwrap(); + $vm.__module_set_attr($crate::pyobject::AsObject::as_object(&namespace), $name, $value).unwrap(); )* namespace } diff --git a/vm/src/protocol/buffer.rs b/vm/src/protocol/buffer.rs index 00e6b410e..7a871beed 100644 --- a/vm/src/protocol/buffer.rs +++ b/vm/src/protocol/buffer.rs @@ -9,7 +9,7 @@ use crate::{ pyobject::PyObjectPayload, sliceable::wrap_index, types::{Constructor, Unconstructible}, - AsPyObject, PyObject, PyObjectRef, PyObjectView, PyObjectWrap, PyRef, PyResult, PyValue, + AsObject, PyObject, PyObjectRef, PyObjectView, PyObjectWrap, PyRef, PyResult, PyValue, TryFromBorrowedObject, VirtualMachine, }; use itertools::Itertools; diff --git a/vm/src/protocol/iter.rs b/vm/src/protocol/iter.rs index 7559fbead..d9b347249 100644 --- a/vm/src/protocol/iter.rs +++ b/vm/src/protocol/iter.rs @@ -1,7 +1,7 @@ use crate::{ builtins::iter::PySequenceIterator, convert::{ToPyObject, ToPyResult}, - AsPyObject, PyObject, PyObjectRef, PyObjectWrap, PyResult, PyValue, TryFromObject, + AsObject, PyObject, PyObjectRef, PyObjectWrap, PyResult, PyValue, TryFromObject, VirtualMachine, }; use std::borrow::Borrow; diff --git a/vm/src/protocol/mapping.rs b/vm/src/protocol/mapping.rs index fec685dda..d78bda459 100644 --- a/vm/src/protocol/mapping.rs +++ b/vm/src/protocol/mapping.rs @@ -5,7 +5,7 @@ use crate::{ }, common::lock::OnceCell, convert::ToPyResult, - AsPyObject, PyObject, PyObjectRef, PyResult, VirtualMachine, + AsObject, PyObject, PyObjectRef, PyResult, VirtualMachine, }; // Mapping protocol @@ -91,13 +91,13 @@ impl PyMapping<'_> { })? } - pub fn subscript(&self, needle: &impl AsPyObject, vm: &VirtualMachine) -> PyResult { + pub fn subscript(&self, needle: &impl AsObject, vm: &VirtualMachine) -> PyResult { self._subscript(needle.as_object(), vm) } pub fn ass_subscript( &self, - needle: &impl AsPyObject, + needle: &impl AsObject, value: Option, vm: &VirtualMachine, ) -> PyResult<()> { diff --git a/vm/src/protocol/object.rs b/vm/src/protocol/object.rs index eca1109aa..c4cb47a1d 100644 --- a/vm/src/protocol/object.rs +++ b/vm/src/protocol/object.rs @@ -14,7 +14,7 @@ use crate::{ protocol::{PyIter, PyMapping, PySequence}, types::{Constructor, PyComparisonOp}, utils::Either, - AsPyObject, PyObject, PyObjectRef, PyResult, TryFromObject, VirtualMachine, + AsObject, PyObject, PyObjectRef, PyResult, TryFromObject, VirtualMachine, }; // RustPython doesn't need these items diff --git a/vm/src/protocol/sequence.rs b/vm/src/protocol/sequence.rs index 063ccb9d0..ca055d5c2 100644 --- a/vm/src/protocol/sequence.rs +++ b/vm/src/protocol/sequence.rs @@ -4,7 +4,7 @@ use crate::{ convert::ToPyObject, function::PyArithmeticValue, protocol::PyMapping, - AsPyObject, PyObject, PyObjectRef, PyResult, PyValue, VirtualMachine, + AsObject, PyObject, PyObjectRef, PyResult, PyValue, VirtualMachine, }; use itertools::Itertools; use std::{ diff --git a/vm/src/py_serde.rs b/vm/src/py_serde.rs index 2ec878cd5..5d2c72149 100644 --- a/vm/src/py_serde.rs +++ b/vm/src/py_serde.rs @@ -4,7 +4,7 @@ use serde::de::{DeserializeSeed, Visitor}; use serde::ser::{Serialize, SerializeMap, SerializeSeq}; use crate::builtins::{dict::PyDictRef, float, int, list::PyList, pybool, tuple::PyTuple, PyStr}; -use crate::{AsPyObject, PyObject, PyObjectRef, VirtualMachine}; +use crate::{AsObject, PyObject, PyObjectRef, VirtualMachine}; #[inline] pub fn serialize( diff --git a/vm/src/pyobject.rs b/vm/src/pyobject.rs index e91684244..e127997ab 100644 --- a/vm/src/pyobject.rs +++ b/vm/src/pyobject.rs @@ -398,7 +398,7 @@ impl ToPyObject for PyRefExact { } } -pub trait AsPyObject +pub trait AsObject where Self: Borrow, { @@ -415,7 +415,7 @@ where #[inline(always)] fn is(&self, other: &T) -> bool where - T: AsPyObject, + T: AsObject, { self.get_id() == other.get_id() } @@ -437,7 +437,7 @@ where } } -impl AsPyObject for T where T: Borrow {} +impl AsObject for T where T: Borrow {} impl PyObject { #[inline(always)] @@ -687,7 +687,7 @@ pub trait PyStructSequence: StaticType + PyClassImpl + Sized + 'static { pub trait PyObjectWrap where - Self: AsPyObject, + Self: AsObject, { fn into_object(self) -> PyObjectRef; } diff --git a/vm/src/pyobjectrc.rs b/vm/src/pyobjectrc.rs index d5ded5570..a66fa1ef5 100644 --- a/vm/src/pyobjectrc.rs +++ b/vm/src/pyobjectrc.rs @@ -3,7 +3,7 @@ use crate::common::linked_list::{Link, LinkedList, Pointers}; use crate::common::lock::{PyMutex, PyMutexGuard, PyRwLock}; use crate::common::refcount::RefCount; use crate::{ - _pyobject::{AsPyObject, PyObjectPayload, PyObjectWrap, PyResult}, + _pyobject::{AsObject, PyObjectPayload, PyObjectWrap, PyResult}, builtins::{PyBaseExceptionRef, PyDictRef, PyTypeRef}, vm::VirtualMachine, }; diff --git a/vm/src/sequence.rs b/vm/src/sequence.rs index dc3784d84..83af45be7 100644 --- a/vm/src/sequence.rs +++ b/vm/src/sequence.rs @@ -3,7 +3,7 @@ use crate::{ types::{richcompare_wrapper, PyComparisonOp, RichCompareFunc}, utils::Either, vm::VirtualMachine, - AsPyObject, PyObject, PyObjectRef, PyResult, + AsObject, PyObject, PyObjectRef, PyResult, }; use itertools::Itertools; use optional::Optioned; diff --git a/vm/src/sliceable.rs b/vm/src/sliceable.rs index b02bb516b..c3b17acd7 100644 --- a/vm/src/sliceable.rs +++ b/vm/src/sliceable.rs @@ -7,7 +7,7 @@ use crate::{ int::PyInt, slice::{PySlice, SaturatedSliceIter}, }, - AsPyObject, PyObject, PyResult, TryFromBorrowedObject, VirtualMachine, + AsObject, PyObject, PyResult, TryFromBorrowedObject, VirtualMachine, }; pub trait SliceableSequenceMutOp { diff --git a/vm/src/stdlib/ast.rs b/vm/src/stdlib/ast.rs index 67d896de0..a6e4e7cd5 100644 --- a/vm/src/stdlib/ast.rs +++ b/vm/src/stdlib/ast.rs @@ -8,7 +8,7 @@ mod gen; use crate::{ builtins::{self, PyStrRef, PyTypeRef}, pyclass::{PyClassImpl, StaticType}, - AsPyObject, PyContext, PyObject, PyObjectRef, PyResult, PyValue, TryFromObject, VirtualMachine, + AsObject, PyContext, PyObject, PyObjectRef, PyResult, PyValue, TryFromObject, VirtualMachine, }; use num_complex::Complex64; use num_traits::{ToPrimitive, Zero}; @@ -21,7 +21,7 @@ use rustpython_parser::parser; #[pymodule] mod _ast { use crate::{ - builtins::PyStrRef, function::FuncArgs, AsPyObject, PyObjectRef, PyResult, PyValue, + builtins::PyStrRef, function::FuncArgs, AsObject, PyObjectRef, PyResult, PyValue, VirtualMachine, }; #[pyattr] diff --git a/vm/src/stdlib/atexit.rs b/vm/src/stdlib/atexit.rs index 80bd83094..5a442874a 100644 --- a/vm/src/stdlib/atexit.rs +++ b/vm/src/stdlib/atexit.rs @@ -3,7 +3,7 @@ pub(crate) use atexit::make_module; #[pymodule] mod atexit { - use crate::{function::FuncArgs, AsPyObject, PyObjectRef, PyResult, VirtualMachine}; + use crate::{function::FuncArgs, AsObject, PyObjectRef, PyResult, VirtualMachine}; #[pyfunction] fn register(func: PyObjectRef, args: FuncArgs, vm: &VirtualMachine) -> PyObjectRef { diff --git a/vm/src/stdlib/builtins.rs b/vm/src/stdlib/builtins.rs index 6a0c2f364..a2ec71335 100644 --- a/vm/src/stdlib/builtins.rs +++ b/vm/src/stdlib/builtins.rs @@ -33,7 +33,7 @@ mod builtins { stdlib::sys, types::PyComparisonOp, utils::Either, - AsPyObject, PyObject, PyObjectRef, PyObjectWrap, PyRef, PyResult, PyValue, TryFromObject, + AsObject, PyObject, PyObjectRef, PyObjectWrap, PyRef, PyResult, PyValue, TryFromObject, VirtualMachine, }; use num_traits::{Signed, ToPrimitive, Zero}; diff --git a/vm/src/stdlib/codecs.rs b/vm/src/stdlib/codecs.rs index 484e1dda5..0702226e4 100644 --- a/vm/src/stdlib/codecs.rs +++ b/vm/src/stdlib/codecs.rs @@ -7,7 +7,7 @@ mod _codecs { builtins::{PyBaseExceptionRef, PyBytes, PyBytesRef, PyStr, PyStrRef, PyTuple}, codecs, function::{ArgBytesLike, FuncArgs}, - AsPyObject, PyObject, PyObjectRef, PyResult, TryFromBorrowedObject, VirtualMachine, + AsObject, PyObject, PyObjectRef, PyResult, TryFromBorrowedObject, VirtualMachine, }; use std::ops::Range; diff --git a/vm/src/stdlib/collections.rs b/vm/src/stdlib/collections.rs index 11252aa9e..54912b2ce 100644 --- a/vm/src/stdlib/collections.rs +++ b/vm/src/stdlib/collections.rs @@ -19,7 +19,7 @@ mod _collections { }, utils::collection_repr, vm::ReprGuard, - AsPyObject, PyObject, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine, + AsObject, PyObject, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine, }; use crossbeam_utils::atomic::AtomicCell; use std::cmp::max; diff --git a/vm/src/stdlib/io.rs b/vm/src/stdlib/io.rs index 2875c96ff..a11ccf9e4 100644 --- a/vm/src/stdlib/io.rs +++ b/vm/src/stdlib/io.rs @@ -88,7 +88,7 @@ mod _io { types::{Constructor, Destructor, IterNext, Iterable}, utils::Either, vm::{ReprGuard, VirtualMachine}, - AsPyObject, PyContext, PyObject, PyObjectRef, PyObjectWrap, PyRef, PyResult, PyValue, + AsObject, PyContext, PyObject, PyObjectRef, PyObjectWrap, PyRef, PyResult, PyValue, TryFromBorrowedObject, TryFromObject, }; use bstr::ByteSlice; @@ -3660,7 +3660,7 @@ mod fileio { crt_fd::Fd, function::{ArgBytesLike, ArgMemoryBuffer, FuncArgs, OptionalArg, OptionalOption}, stdlib::os, - AsPyObject, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject, VirtualMachine, + AsObject, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject, VirtualMachine, }; use crossbeam_utils::atomic::AtomicCell; use std::io::{Read, Write}; diff --git a/vm/src/stdlib/itertools.rs b/vm/src/stdlib/itertools.rs index 1049d036b..400cc10b9 100644 --- a/vm/src/stdlib/itertools.rs +++ b/vm/src/stdlib/itertools.rs @@ -13,7 +13,7 @@ mod decl { protocol::{PyIter, PyIterReturn}, stdlib::sys, types::{Constructor, IterNext, IterNextIterable}, - AsPyObject, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue, PyWeakRef, VirtualMachine, + AsObject, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue, PyWeakRef, VirtualMachine, }; use crossbeam_utils::atomic::AtomicCell; use num_bigint::BigInt; diff --git a/vm/src/stdlib/marshal.rs b/vm/src/stdlib/marshal.rs index c5e7497fe..fd5f50a27 100644 --- a/vm/src/stdlib/marshal.rs +++ b/vm/src/stdlib/marshal.rs @@ -11,7 +11,7 @@ mod decl { convert::ToPyObject, function::ArgBytesLike, protocol::PyBuffer, - pyobject::AsPyObject, + pyobject::AsObject, PyObjectRef, PyResult, TryFromObject, VirtualMachine, }; /// TODO diff --git a/vm/src/stdlib/operator.rs b/vm/src/stdlib/operator.rs index 1366ca7bb..e22a07fb0 100644 --- a/vm/src/stdlib/operator.rs +++ b/vm/src/stdlib/operator.rs @@ -20,7 +20,7 @@ mod _operator { }, utils::Either, vm::ReprGuard, - AsPyObject, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue, VirtualMachine, + AsObject, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue, VirtualMachine, }; /// Same as a < b. diff --git a/vm/src/stdlib/os.rs b/vm/src/stdlib/os.rs index 87bcb1806..fa17e4740 100644 --- a/vm/src/stdlib/os.rs +++ b/vm/src/stdlib/os.rs @@ -4,7 +4,7 @@ use crate::{ crt_fd::Fd, function::{ArgumentError, FromArgs, FuncArgs}, protocol::PyBuffer, - AsPyObject, PyObject, PyObjectRef, PyResult, PyValue, TryFromBorrowedObject, TryFromObject, + AsObject, PyObject, PyObjectRef, PyResult, PyValue, TryFromBorrowedObject, TryFromObject, VirtualMachine, }; use std::{ @@ -442,7 +442,7 @@ pub(super) mod _os { types::{IterNext, IterNextIterable}, utils::Either, vm::{ReprGuard, VirtualMachine}, - AsPyObject, PyObjectRef, PyRef, PyResult, PyStructSequence, PyValue, TryFromObject, + AsObject, PyObjectRef, PyRef, PyResult, PyStructSequence, PyValue, TryFromObject, }; use crossbeam_utils::atomic::AtomicCell; use itertools::Itertools; diff --git a/vm/src/stdlib/posix.rs b/vm/src/stdlib/posix.rs index 99f7c5836..9c31d17dd 100644 --- a/vm/src/stdlib/posix.rs +++ b/vm/src/stdlib/posix.rs @@ -38,7 +38,7 @@ pub mod module { }, types::Constructor, utils::{Either, ToCString}, - AsPyObject, PyObjectRef, PyResult, PyValue, VirtualMachine, + AsObject, PyObjectRef, PyResult, PyValue, VirtualMachine, }; use bitflags::bitflags; use nix::{ @@ -558,7 +558,7 @@ pub mod module { target_os = "android" ))] fn try_to_libc(&self, vm: &VirtualMachine) -> PyResult { - use crate::AsPyObject; + use crate::AsObject; let priority_class = self.sched_priority.class(); let priority_type = priority_class.name(); let priority = self.sched_priority.clone(); diff --git a/vm/src/stdlib/pwd.rs b/vm/src/stdlib/pwd.rs index 125ae5a53..cea7ba6f1 100644 --- a/vm/src/stdlib/pwd.rs +++ b/vm/src/stdlib/pwd.rs @@ -5,7 +5,7 @@ mod pwd { use crate::{ builtins::{PyIntRef, PyStrRef}, convert::{ToPyException, ToPyObject}, - AsPyObject, PyObjectRef, PyResult, PyStructSequence, VirtualMachine, + AsObject, PyObjectRef, PyResult, PyStructSequence, VirtualMachine, }; use nix::unistd::{self, User}; use std::ptr::NonNull; diff --git a/vm/src/stdlib/thread.rs b/vm/src/stdlib/thread.rs index 55b454edf..a540d0ef3 100644 --- a/vm/src/stdlib/thread.rs +++ b/vm/src/stdlib/thread.rs @@ -11,7 +11,7 @@ pub(crate) mod _thread { py_io, types::{Constructor, GetAttr, SetAttr}, utils::Either, - AsPyObject, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine, + AsObject, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine, }; use parking_lot::{ lock_api::{RawMutex as RawMutexT, RawMutexTimed, RawReentrantMutex}, diff --git a/vm/src/stdlib/warnings.rs b/vm/src/stdlib/warnings.rs index 4ecc46aa6..011baa0f0 100644 --- a/vm/src/stdlib/warnings.rs +++ b/vm/src/stdlib/warnings.rs @@ -5,7 +5,7 @@ mod _warnings { use crate::{ builtins::{PyStrRef, PyTypeRef}, function::OptionalArg, - AsPyObject, PyResult, VirtualMachine, + AsObject, PyResult, VirtualMachine, }; #[derive(FromArgs)] diff --git a/vm/src/suggestion.rs b/vm/src/suggestion.rs index 81fdcaabb..c215b611e 100644 --- a/vm/src/suggestion.rs +++ b/vm/src/suggestion.rs @@ -2,7 +2,7 @@ use crate::{ builtins::{PyStr, PyStrRef}, exceptions::types::PyBaseExceptionRef, sliceable::SliceableSequenceOp, - AsPyObject, PyObjectRef, PyObjectView, VirtualMachine, + AsObject, PyObjectRef, PyObjectView, VirtualMachine, }; use rustpython_common::str::levenshtein::{levenshtein_distance, MOVE_COST}; use std::iter::ExactSizeIterator; diff --git a/vm/src/types/slot.rs b/vm/src/types/slot.rs index 4dae0ccaa..00d51216b 100644 --- a/vm/src/types/slot.rs +++ b/vm/src/types/slot.rs @@ -8,7 +8,7 @@ use crate::{ PyBuffer, PyIterReturn, PyMapping, PyMappingMethods, PySequence, PySequenceMethods, }, utils::Either, - AsPyObject, PyObject, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue, VirtualMachine, + AsObject, PyObject, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue, VirtualMachine, }; use crossbeam_utils::atomic::AtomicCell; use num_traits::{Signed, ToPrimitive}; diff --git a/vm/src/utils.rs b/vm/src/utils.rs index 043b9de91..8ef67dec6 100644 --- a/vm/src/utils.rs +++ b/vm/src/utils.rs @@ -1,7 +1,7 @@ use crate::{ builtins::{PyFloat, PyStr}, convert::{ToPyException, ToPyObject}, - AsPyObject, PyObject, PyObjectRef, PyObjectWrap, PyResult, TryFromObject, VirtualMachine, + AsObject, PyObject, PyObjectRef, PyObjectWrap, PyResult, TryFromObject, VirtualMachine, }; use num_traits::ToPrimitive; use std::borrow::Borrow; diff --git a/vm/src/vm.rs b/vm/src/vm.rs index b5c3b5ec0..88c4df262 100644 --- a/vm/src/vm.rs +++ b/vm/src/vm.rs @@ -24,7 +24,7 @@ use crate::{ import, protocol::PyIterIter, scope::Scope, - signal, stdlib, AsPyObject, PyContext, PyObject, PyObjectRef, PyRef, PyRefExact, PyResult, + signal, stdlib, AsObject, PyContext, PyObject, PyObjectRef, PyRef, PyRefExact, PyResult, PyValue, }; use crossbeam_utils::atomic::AtomicCell; @@ -67,7 +67,7 @@ struct ExceptionStack { } pub(crate) mod thread { - use super::{AsPyObject, PyObject, VirtualMachine}; + use super::{AsObject, PyObject, VirtualMachine}; use itertools::Itertools; use std::{cell::RefCell, ptr::NonNull, thread_local}; diff --git a/vm/src/vm_new.rs b/vm/src/vm_new.rs index d1b6a07a1..701cd52e6 100644 --- a/vm/src/vm_new.rs +++ b/vm/src/vm_new.rs @@ -10,7 +10,7 @@ use crate::{ convert::ToPyObject, scope::Scope, vm::VirtualMachine, - AsPyObject, PyObject, PyObjectRef, PyObjectWrap, PyRef, PyValue, + AsObject, PyObject, PyObjectRef, PyObjectWrap, PyRef, PyValue, }; /// Collection of object creation helpers @@ -288,7 +288,7 @@ impl VirtualMachine { pub(crate) fn new_downcast_runtime_error( &self, class: &PyTypeRef, - obj: &impl AsPyObject, + obj: &impl AsObject, ) -> PyBaseExceptionRef { self.new_downcast_error( "payload", @@ -301,7 +301,7 @@ impl VirtualMachine { pub(crate) fn new_downcast_type_error( &self, class: &PyTypeRef, - obj: &impl AsPyObject, + obj: &impl AsObject, ) -> PyBaseExceptionRef { self.new_downcast_error( "type", diff --git a/vm/src/vm_object.rs b/vm/src/vm_object.rs index d9f1bd2d7..8e39ebae6 100644 --- a/vm/src/vm_object.rs +++ b/vm/src/vm_object.rs @@ -2,7 +2,7 @@ use crate::{ builtins::{PyBaseExceptionRef, PyList, PyStr}, function::{FuncArgs, IntoFuncArgs}, vm::VirtualMachine, - AsPyObject, PyMethod, PyObject, PyObjectRef, PyResult, PyValue, + AsObject, PyMethod, PyObject, PyObjectRef, PyResult, PyValue, }; /// Trace events for sys.settrace and sys.setprofile. @@ -179,7 +179,7 @@ impl VirtualMachine { } #[inline(always)] - pub fn invoke(&self, func: &impl AsPyObject, args: impl IntoFuncArgs) -> PyResult { + pub fn invoke(&self, func: &impl AsObject, args: impl IntoFuncArgs) -> PyResult { self._invoke(func.as_object(), args.into_args(self)) } diff --git a/vm/src/vm_ops.rs b/vm/src/vm_ops.rs index ade8a14a4..0a3d9738b 100644 --- a/vm/src/vm_ops.rs +++ b/vm/src/vm_ops.rs @@ -4,7 +4,7 @@ use crate::{ protocol::PyIterReturn, types::PyComparisonOp, vm::VirtualMachine, - AsPyObject, PyMethod, PyObject, PyObjectRef, PyResult, + AsObject, PyMethod, PyObject, PyObjectRef, PyResult, }; /// Collection of operators diff --git a/wasm/lib/src/convert.rs b/wasm/lib/src/convert.rs index f810aefa0..8a516e2b9 100644 --- a/wasm/lib/src/convert.rs +++ b/wasm/lib/src/convert.rs @@ -7,7 +7,7 @@ use rustpython_vm::{ compile::{CompileError, CompileErrorType}, exceptions, function::{ArgBytesLike, FuncArgs}, - py_serde, AsPyObject, PyObjectRef, PyResult, PyValue, TryFromBorrowedObject, VirtualMachine, + py_serde, AsObject, PyObjectRef, PyResult, PyValue, TryFromBorrowedObject, VirtualMachine, }; use wasm_bindgen::{closure::Closure, prelude::*, JsCast};