Skip to content

Commit fee3bf2

Browse files
youknowoneyouknowone
committed
AsPyObject -> AsObject because fn as_object
1 parent 6121195 commit fee3bf2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+110
-111
lines changed

‎src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ use rustpython_vm::{
5151
compile, match_class,
5252
scope::Scope,
5353
stdlib::{atexit, sys},
54-
AsPyObject, InitParameter, Interpreter, PyObjectRef, PyResult, PySettings, TryFromObject,
54+
AsObject, InitParameter, Interpreter, PyObjectRef, PyResult, PySettings, TryFromObject,
5555
VirtualMachine,
5656
};
5757
use std::{env, path::Path, process, str::FromStr};

‎src/shell.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use rustpython_vm::{
66
builtins::PyBaseExceptionRef,
77
compile::{self, CompileError, CompileErrorType},
88
scope::Scope,
9-
AsPyObject, PyResult, VirtualMachine,
9+
AsObject, PyResult, VirtualMachine,
1010
};
1111

1212
enum ShellExecResult {

‎stdlib/src/array.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ mod array {
3131
AsBuffer, AsMapping, Comparable, Constructor, IterNext, IterNextIterable, Iterable,
3232
PyComparisonOp,
3333
},
34-
AsPyObject, PyObject, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue,
34+
AsObject, PyObject, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue,
3535
VirtualMachine,
3636
},
3737
};

‎stdlib/src/csv.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ mod _csv {
1616
match_class,
1717
protocol::{PyIter, PyIterReturn},
1818
types::{IterNext, IterNextIterable},
19-
AsPyObject, PyObjectRef, PyObjectView, PyResult, PyValue, TryFromObject, VirtualMachine,
19+
AsObject, PyObjectRef, PyObjectView, PyResult, PyValue, TryFromObject, VirtualMachine,
2020
};
2121
use itertools::{self, Itertools};
2222
use std::fmt;

‎stdlib/src/json.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ mod _json {
1010
function::OptionalArg,
1111
protocol::PyIterReturn,
1212
types::{Callable, Constructor},
13-
AsPyObject, PyObjectRef, PyObjectView, PyResult, PyValue, VirtualMachine,
13+
AsObject, PyObjectRef, PyObjectView, PyResult, PyValue, VirtualMachine,
1414
};
1515
use num_bigint::BigInt;
1616
use std::str::FromStr;

‎stdlib/src/math.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ mod math {
66
builtins::{try_bigint_to_f64, try_f64_to_bigint, PyFloat, PyInt, PyIntRef},
77
function::{ArgIntoFloat, ArgIterable, OptionalArg, PosArgs},
88
utils::Either,
9-
AsPyObject, PyObject, PyObjectRef, PyRef, PyResult, VirtualMachine,
9+
AsObject, PyObject, PyObjectRef, PyRef, PyResult, VirtualMachine,
1010
};
1111
use num_bigint::BigInt;
1212
use num_traits::{One, Signed, Zero};

‎stdlib/src/pystruct.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub(crate) mod _struct {
1616
match_class,
1717
protocol::PyIterReturn,
1818
types::{Constructor, IterNext, IterNextIterable},
19-
AsPyObject, PyObjectRef, PyObjectView, PyResult, PyValue, TryFromObject, VirtualMachine,
19+
AsObject, PyObjectRef, PyObjectView, PyResult, PyValue, TryFromObject, VirtualMachine,
2020
};
2121
use crossbeam_utils::atomic::AtomicCell;
2222

‎stdlib/src/select.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ mod decl {
261261
use super::*;
262262
use crate::vm::{
263263
builtins::PyFloat, common::lock::PyMutex, convert::ToPyObject, function::OptionalArg,
264-
stdlib::io::Fildes, AsPyObject, PyValue,
264+
stdlib::io::Fildes, AsObject, PyValue,
265265
};
266266
use libc::pollfd;
267267
use num_traits::ToPrimitive;

‎stdlib/src/socket.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ mod _socket {
1616
convert::{ToPyException, ToPyObject, TryFromBorrowedObject, TryFromObject},
1717
function::{ArgBytesLike, ArgMemoryBuffer, FuncArgs, OptionalArg, OptionalOption},
1818
utils::{Either, ToCString},
19-
AsPyObject, PyObjectRef, PyResult, PyValue, VirtualMachine,
19+
AsObject, PyObjectRef, PyResult, PyValue, VirtualMachine,
2020
};
2121
use crossbeam_utils::atomic::AtomicCell;
2222
use num_traits::ToPrimitive;

‎vm/src/anystr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use crate::{
33
cformat::CFormatString,
44
function::{single_or_tuple_any, OptionalOption},
55
protocol::PyIterIter,
6-
AsPyObject, PyObjectRef, PyResult, TryFromObject, VirtualMachine,
6+
AsObject, PyObjectRef, PyResult, TryFromObject, VirtualMachine,
77
};
88
use num_traits::{cast::ToPrimitive, sign::Signed};
99
use std::str::FromStr;

‎vm/src/builtins/asyncgenerator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use crate::{
77
protocol::PyIterReturn,
88
pyclass::PyClassImpl,
99
types::{Constructor, IterNext, IterNextIterable, Unconstructible},
10-
AsPyObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine,
10+
AsObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine,
1111
};
1212

1313
use crossbeam_utils::atomic::AtomicCell;

‎vm/src/builtins/builtinfunc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::{
44
function::{FuncArgs, IntoPyNativeFunc, PyNativeFunc},
55
pyclass::PyClassImpl,
66
types::{Callable, Constructor, GetDescriptor, Unconstructible},
7-
AsPyObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine,
7+
AsObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine,
88
};
99
use std::fmt;
1010

‎vm/src/builtins/bytearray.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ use crate::{
3333
IterNextIterable, Iterable, PyComparisonOp, Unconstructible, Unhashable,
3434
},
3535
utils::Either,
36-
AsPyObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyObjectWrap, PyRef, PyResult,
36+
AsObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyObjectWrap, PyRef, PyResult,
3737
PyValue, TryFromBorrowedObject, TryFromObject, VirtualMachine,
3838
};
3939
use bstr::ByteSlice;

‎vm/src/builtins/bytes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use crate::{
2020
IterNextIterable, Iterable, PyComparisonOp, Unconstructible,
2121
},
2222
utils::Either,
23-
AsPyObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyObjectWrap, PyRef, PyResult,
23+
AsObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyObjectWrap, PyRef, PyResult,
2424
PyValue, TryFromBorrowedObject, TryFromObject, VirtualMachine,
2525
};
2626
use bstr::ByteSlice;

‎vm/src/builtins/classmethod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use crate::{
33
builtins::PyBoundMethod,
44
pyclass::PyClassImpl,
55
types::{Constructor, GetDescriptor},
6-
AsPyObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine,
6+
AsObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine,
77
};
88

99
/// classmethod(function) -> method

‎vm/src/builtins/code.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use crate::{
77
bytecode::{self, BorrowedConstant, Constant, ConstantBag},
88
function::FuncArgs,
99
pyclass::{PyClassImpl, StaticType},
10-
AsPyObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine,
10+
AsObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine,
1111
};
1212
use num_traits::Zero;
1313
use std::{fmt, ops::Deref};

‎vm/src/builtins/complex.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use crate::{
88
},
99
pyclass::PyClassImpl,
1010
types::{Comparable, Constructor, Hashable, PyComparisonOp},
11-
AsPyObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine,
11+
AsObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine,
1212
};
1313
use num_complex::Complex64;
1414
use num_traits::Zero;

‎vm/src/builtins/coroutine.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use crate::{
66
protocol::PyIterReturn,
77
pyclass::PyClassImpl,
88
types::{Constructor, IterNext, IterNextIterable, Unconstructible},
9-
AsPyObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine,
9+
AsObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine,
1010
};
1111

1212
#[pyclass(module = false, name = "coroutine")]

‎vm/src/builtins/dict.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use crate::{
2121
IterNextIterable, Iterable, PyComparisonOp, Unconstructible, Unhashable,
2222
},
2323
vm::{ReprGuard, VirtualMachine},
24-
AsPyObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue,
24+
AsObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue,
2525
TryFromObject,
2626
};
2727
use rustpython_common::lock::PyMutex;

‎vm/src/builtins/enumerate.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use crate::{
66
protocol::{PyIter, PyIterReturn},
77
pyclass::PyClassImpl,
88
types::{Constructor, IterNext, IterNextIterable},
9-
AsPyObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine,
9+
AsObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine,
1010
};
1111
use num_bigint::BigInt;
1212
use num_traits::Zero;

‎vm/src/builtins/float.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use crate::{
1010
},
1111
pyclass::PyClassImpl,
1212
types::{Comparable, Constructor, Hashable, PyComparisonOp},
13-
AsPyObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, TryFromBorrowedObject,
13+
AsObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, TryFromBorrowedObject,
1414
TryFromObject, VirtualMachine,
1515
};
1616
use num_bigint::{BigInt, ToBigInt};

‎vm/src/builtins/frame.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use crate::{
77
frame::{Frame, FrameRef},
88
pyclass::PyClassImpl,
99
types::{Constructor, Unconstructible},
10-
AsPyObject, PyContext, PyObjectRef, PyObjectWrap, PyRef, PyResult, VirtualMachine,
10+
AsObject, PyContext, PyObjectRef, PyObjectWrap, PyRef, PyResult, VirtualMachine,
1111
};
1212

1313
pub fn init(context: &PyContext) {

‎vm/src/builtins/function.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use crate::{
1414
pyclass::PyClassImpl,
1515
scope::Scope,
1616
types::{Callable, Comparable, Constructor, GetAttr, GetDescriptor, PyComparisonOp},
17-
AsPyObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine,
17+
AsObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine,
1818
};
1919
#[cfg(feature = "jit")]
2020
use crate::{common::lock::OnceCell, convert::ToPyObject};

‎vm/src/builtins/function/jitfunc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use crate::{
33
bytecode::CodeFlags,
44
convert::ToPyObject,
55
function::FuncArgs,
6-
AsPyObject, PyObject, PyObjectRef, PyResult, TryFromObject, VirtualMachine,
6+
AsObject, PyObject, PyObjectRef, PyResult, TryFromObject, VirtualMachine,
77
};
88
use num_traits::ToPrimitive;
99
use rustpython_jit::{AbiValue, Args, CompiledCode, JitArgumentError, JitType};

‎vm/src/builtins/generator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use crate::{
1010
protocol::PyIterReturn,
1111
pyclass::PyClassImpl,
1212
types::{Constructor, IterNext, IterNextIterable, Unconstructible},
13-
AsPyObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine,
13+
AsObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine,
1414
};
1515

1616
#[pyclass(module = false, name = "generator")]

‎vm/src/builtins/genericalias.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use crate::{
66
protocol::PyMappingMethods,
77
pyclass::PyClassImpl,
88
types::{AsMapping, Callable, Comparable, Constructor, GetAttr, Hashable, PyComparisonOp},
9-
AsPyObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue,
9+
AsObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue,
1010
TryFromObject, VirtualMachine,
1111
};
1212
use std::fmt;

‎vm/src/builtins/getset.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use crate::{
88
pyclass::PyClassImpl,
99
pyobject::PyThreadingConstraint,
1010
types::{Constructor, GetDescriptor, Unconstructible},
11-
AsPyObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject, VirtualMachine,
11+
AsObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject, VirtualMachine,
1212
};
1313

1414
pub type PyGetterFunc = Box<py_dyn_fn!(dyn Fn(&VirtualMachine, PyObjectRef) -> PyResult)>;

‎vm/src/builtins/int.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use crate::{
77
function::{ArgIntoBool, OptionalArg, OptionalOption, PyArithmeticValue, PyComparisonValue},
88
pyclass::PyClassImpl,
99
types::{Comparable, Constructor, Hashable, PyComparisonOp},
10-
AsPyObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, TryFromBorrowedObject,
10+
AsObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, TryFromBorrowedObject,
1111
VirtualMachine,
1212
};
1313
use bstr::ByteSlice;

‎vm/src/builtins/list.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use crate::{
1616
},
1717
utils::collection_repr,
1818
vm::{ReprGuard, VirtualMachine},
19-
AsPyObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyObjectWrap, PyRef, PyResult,
19+
AsObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyObjectWrap, PyRef, PyResult,
2020
PyValue,
2121
};
2222
use std::{borrow::Cow, fmt, ops::DerefMut};

‎vm/src/builtins/mappingproxy.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use crate::{
77
protocol::{PyMapping, PyMappingMethods, PySequence, PySequenceMethods},
88
pyclass::PyClassImpl,
99
types::{AsMapping, AsSequence, Constructor, Iterable},
10-
AsPyObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject,
10+
AsObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject,
1111
VirtualMachine,
1212
};
1313

‎vm/src/builtins/memory.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use crate::{
1919
sliceable::wrap_index,
2020
types::{AsBuffer, AsMapping, AsSequence, Comparable, Constructor, Hashable, PyComparisonOp},
2121
utils::Either,
22-
AsPyObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyObjectWrap, PyRef, PyResult,
22+
AsObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyObjectWrap, PyRef, PyResult,
2323
PyValue, TryFromBorrowedObject, TryFromObject, VirtualMachine,
2424
};
2525
use crossbeam_utils::atomic::AtomicCell;

‎vm/src/builtins/module.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use super::pystr::IntoPyStrRef;
22
use super::{PyDictRef, PyStr, PyStrRef, PyTypeRef};
33
use crate::{
4-
convert::ToPyObject, function::FuncArgs, pyclass::PyClassImpl, types::GetAttr, AsPyObject,
4+
convert::ToPyObject, function::FuncArgs, pyclass::PyClassImpl, types::GetAttr, AsObject,
55
PyContext, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue, VirtualMachine,
66
};
77

‎vm/src/builtins/namespace.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::{
55
pyclass::PyClassImpl,
66
types::{Comparable, Constructor, PyComparisonOp},
77
vm::ReprGuard,
8-
AsPyObject, PyContext, PyObject, PyRef, PyResult, PyValue, VirtualMachine,
8+
AsObject, PyContext, PyObject, PyRef, PyResult, PyValue, VirtualMachine,
99
};
1010

1111
/// A simple attribute-based namespace.

‎vm/src/builtins/object.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::{
55
pyclass::PyClassImpl,
66
types::PyComparisonOp,
77
utils::Either,
8-
AsPyObject, PyContext, PyObject, PyObjectRef, PyResult, PyValue, VirtualMachine,
8+
AsObject, PyContext, PyObject, PyObjectRef, PyResult, PyValue, VirtualMachine,
99
};
1010

1111
/// object()

‎vm/src/builtins/property.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
use super::PyTypeRef;
55
use crate::common::lock::PyRwLock;
66
use crate::{
7-
function::FuncArgs, pyclass::PyClassImpl, types::GetDescriptor, AsPyObject, PyContext,
7+
function::FuncArgs, pyclass::PyClassImpl, types::GetDescriptor, AsObject, PyContext,
88
PyObjectRef, PyRef, PyResult, PyValue, TryFromObject, VirtualMachine,
99
};
1010

‎vm/src/builtins/pybool.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
use super::{PyInt, PyStrRef, PyTypeRef};
22
use crate::{
3-
convert::ToPyObject, function::OptionalArg, pyclass::PyClassImpl, types::Constructor,
4-
AsPyObject, PyContext, PyObject, PyObjectRef, PyResult, PyValue, TryFromBorrowedObject,
5-
VirtualMachine,
3+
convert::ToPyObject, function::OptionalArg, pyclass::PyClassImpl, types::Constructor, AsObject,
4+
PyContext, PyObject, PyObjectRef, PyResult, PyValue, TryFromBorrowedObject, VirtualMachine,
65
};
76
use num_bigint::Sign;
87
use num_traits::Zero;

‎vm/src/builtins/pystr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use crate::{
1616
AsMapping, AsSequence, Comparable, Constructor, Hashable, IterNext, IterNextIterable,
1717
Iterable, PyComparisonOp, Unconstructible,
1818
},
19-
AsPyObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue,
19+
AsObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue,
2020
TryFromBorrowedObject, VirtualMachine,
2121
};
2222
use ascii::{AsciiStr, AsciiString};

‎vm/src/builtins/pysuper.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use crate::{
88
function::OptionalArg,
99
pyclass::PyClassImpl,
1010
types::{Constructor, GetAttr, GetDescriptor},
11-
AsPyObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine,
11+
AsObject, PyContext, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine,
1212
};
1313

1414
#[pyclass(module = false, name = "super")]

‎vm/src/builtins/pytype.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use crate::{
1111
function::{FuncArgs, KwArgs, OptionalArg},
1212
pyclass::{PyClassImpl, StaticType},
1313
types::{Callable, GetAttr, PyTypeFlags, PyTypeSlots, SetAttr},
14-
AsPyObject, PyContext, PyObjectRef, PyObjectWeak, PyRef, PyResult, PyValue, VirtualMachine,
14+
AsObject, PyContext, PyObjectRef, PyObjectWeak, PyRef, PyResult, PyValue, VirtualMachine,
1515
};
1616
use itertools::Itertools;
1717
use std::{

‎vm/src/builtins/pyunion.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use crate::{
77
protocol::PyMappingMethods,
88
pyclass::PyClassImpl,
99
types::{AsMapping, Comparable, GetAttr, Hashable, Iterable, PyComparisonOp},
10-
AsPyObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue,
10+
AsObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue,
1111
TryFromObject, VirtualMachine,
1212
};
1313
use std::fmt;

‎vm/src/builtins/range.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use crate::{
99
AsMapping, AsSequence, Comparable, Constructor, Hashable, IterNext, IterNextIterable,
1010
Iterable, PyComparisonOp, Unconstructible,
1111
},
12-
AsPyObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue,
12+
AsObject, PyContext, PyObject, PyObjectRef, PyObjectView, PyRef, PyResult, PyValue,
1313
TryFromObject, VirtualMachine,
1414
};
1515
use crossbeam_utils::atomic::AtomicCell;

‎vm/src/builtins/set.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use crate::{
1717
},
1818
utils::collection_repr,
1919
vm::{ReprGuard, VirtualMachine},
20-
AsPyObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject,
20+
AsObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject,
2121
};
2222
use std::borrow::Cow;
2323
use std::{fmt, ops::Deref};

‎vm/src/builtins/singletons.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use super::PyTypeRef;
22
use crate::{
3-
convert::ToPyObject, pyclass::PyClassImpl, types::Constructor, AsPyObject, PyContext,
3+
convert::ToPyObject, pyclass::PyClassImpl, types::Constructor, AsObject, PyContext,
44
PyObjectRef, PyResult, PyValue, VirtualMachine,
55
};
66

‎vm/src/builtins/slice.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::{
55
function::{FuncArgs, OptionalArg, PyComparisonValue},
66
pyclass::PyClassImpl,
77
types::{Comparable, Constructor, Hashable, PyComparisonOp, Unhashable},
8-
AsPyObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine,
8+
AsObject, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine,
99
};
1010
use num_bigint::{BigInt, ToBigInt};
1111
use num_traits::{One, Signed, ToPrimitive, Zero};

0 commit comments

Comments
 (0)