Skip to content

Commit ffef73c

Browse files
youknowoneyouknowone
committed
split Arg{Callble,Iterable} from pyobject.rs
1 parent a5309a7 commit ffef73c

File tree

26 files changed

+182
-171
lines changed

26 files changed

+182
-171
lines changed

‎src/shell/helper.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use rustpython_vm::builtins::{PyDictRef, PyStrRef};
22
use rustpython_vm::VirtualMachine;
3-
use rustpython_vm::{ArgIterable, PyResult, TryFromObject};
3+
use rustpython_vm::{function::ArgIterable, PyResult, TryFromObject};
44

55
pub struct ShellHelper<'vm> {
66
vm: &'vm VirtualMachine,

‎vm/src/anystr.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crate::builtins::int::PyIntRef;
22
use crate::cformat::CFormatString;
33
use crate::function::{single_or_tuple_any, OptionalOption};
44
use crate::vm::VirtualMachine;
5-
use crate::{PyIterator, PyObjectRef, PyResult, TryFromObject, TypeProtocol};
5+
use crate::{function::PyIterator, PyObjectRef, PyResult, TryFromObject, TypeProtocol};
66
use num_traits::{cast::ToPrimitive, sign::Signed};
77
use std::str::FromStr;
88

‎vm/src/builtins/bytearray.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ use crate::slots::{
2626
use crate::utils::Either;
2727
use crate::vm::VirtualMachine;
2828
use crate::{
29-
ArgIterable, IdProtocol, IntoPyObject, PyClassDef, PyClassImpl, PyComparisonValue, PyContext,
30-
PyObjectRef, PyRef, PyResult, PyValue, TypeProtocol,
29+
function::ArgIterable, IdProtocol, IntoPyObject, PyClassDef, PyClassImpl, PyComparisonValue,
30+
PyContext, PyObjectRef, PyRef, PyResult, PyValue, TypeProtocol,
3131
};
3232
use bstr::ByteSlice;
3333
use crossbeam_utils::atomic::AtomicCell;

‎vm/src/builtins/bytes.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ use crate::slots::{
1818
use crate::utils::Either;
1919
use crate::vm::VirtualMachine;
2020
use crate::{
21-
ArgIterable, IdProtocol, IntoPyObject, IntoPyResult, PyClassImpl, PyComparisonValue, PyContext,
22-
PyObjectRef, PyRef, PyResult, PyValue, TryFromBorrowedObject, TypeProtocol,
21+
function::ArgIterable, IdProtocol, IntoPyObject, IntoPyResult, PyClassImpl, PyComparisonValue,
22+
PyContext, PyObjectRef, PyRef, PyResult, PyValue, TryFromBorrowedObject, TypeProtocol,
2323
};
2424
use bstr::ByteSlice;
2525
use crossbeam_utils::atomic::AtomicCell;

‎vm/src/builtins/dict.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ use crate::iterator;
1313
use crate::slots::{Comparable, Hashable, Iterable, PyComparisonOp, PyIter, Unhashable};
1414
use crate::vm::{ReprGuard, VirtualMachine};
1515
use crate::{
16-
ArgIterable, IdProtocol, IntoPyObject, ItemProtocol, PyArithmaticValue::*, PyAttributes,
17-
PyClassDef, PyClassImpl, PyComparisonValue, PyContext, PyObjectRef, PyRef, PyResult, PyValue,
18-
TryFromObject, TypeProtocol,
16+
function::ArgIterable, IdProtocol, IntoPyObject, ItemProtocol, PyArithmaticValue::*,
17+
PyAttributes, PyClassDef, PyClassImpl, PyComparisonValue, PyContext, PyObjectRef, PyRef,
18+
PyResult, PyValue, TryFromObject, TypeProtocol,
1919
};
2020

2121
pub type DictContentType = dictdatatype::Dict;

‎vm/src/builtins/iter.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ use super::{int, PyInt};
99
use crate::slots::PyIter;
1010
use crate::vm::VirtualMachine;
1111
use crate::{
12-
ArgCallable, ItemProtocol, PyClassImpl, PyContext, PyObjectRef, PyRef, PyResult, PyValue,
13-
TypeProtocol,
12+
function::ArgCallable, ItemProtocol, PyClassImpl, PyContext, PyObjectRef, PyRef, PyResult,
13+
PyValue, TypeProtocol,
1414
};
1515

1616
/// Marks status of iterator.

‎vm/src/builtins/list.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ use crate::slots::{Comparable, Hashable, Iterable, PyComparisonOp, PyIter, Unhas
2424
use crate::utils::Either;
2525
use crate::vm::{ReprGuard, VirtualMachine};
2626
use crate::{
27-
ArgIterable, PyClassDef, PyClassImpl, PyComparisonValue, PyContext, PyObjectRef, PyRef,
28-
PyResult, PyValue, TryFromObject, TypeProtocol,
27+
function::ArgIterable, PyClassDef, PyClassImpl, PyComparisonValue, PyContext, PyObjectRef,
28+
PyRef, PyResult, PyValue, TryFromObject, TypeProtocol,
2929
};
3030

3131
/// Built-in mutable sequence.

‎vm/src/builtins/make_module.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ mod decl {
3232
use crate::slots::PyComparisonOp;
3333
use crate::utils::Either;
3434
use crate::vm::VirtualMachine;
35-
use crate::{py_io, sysmodule};
3635
use crate::{
37-
ArgCallable, ArgIterable, IdProtocol, ItemProtocol, PyArithmaticValue, PyClassImpl,
38-
PyObjectRef, PyResult, PyValue, TryFromObject, TypeProtocol,
36+
function::ArgCallable, function::ArgIterable, IdProtocol, ItemProtocol, PyArithmaticValue,
37+
PyClassImpl, PyObjectRef, PyResult, PyValue, TryFromObject, TypeProtocol,
3938
};
39+
use crate::{py_io, sysmodule};
4040
use num_traits::{Signed, Zero};
4141

4242
#[pyfunction]

‎vm/src/builtins/pystr.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use crate::slots::{Comparable, Hashable, Iterable, PyComparisonOp, PyIter, SlotC
1515
use crate::utils::Either;
1616
use crate::VirtualMachine;
1717
use crate::{
18-
ArgIterable, IdProtocol, IntoPyObject, ItemProtocol, PyClassDef, PyClassImpl,
18+
function::ArgIterable, IdProtocol, IntoPyObject, ItemProtocol, PyClassDef, PyClassImpl,
1919
PyComparisonValue, PyContext, PyObjectRef, PyRef, PyResult, PyValue, TryIntoRef, TypeProtocol,
2020
};
2121
use bstr::ByteSlice;

‎vm/src/builtins/set.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ use crate::slots::{
1212
};
1313
use crate::vm::{ReprGuard, VirtualMachine};
1414
use crate::{
15-
ArgIterable, IdProtocol, PyClassImpl, PyComparisonValue, PyContext, PyObjectRef, PyRef,
16-
PyResult, PyValue, TryFromObject, TypeProtocol,
15+
function::ArgIterable, IdProtocol, PyClassImpl, PyComparisonValue, PyContext, PyObjectRef,
16+
PyRef, PyResult, PyValue, TryFromObject, TypeProtocol,
1717
};
1818
use crossbeam_utils::atomic::AtomicCell;
1919
use std::fmt;

0 commit comments

Comments
 (0)