Skip to content

Commit c06bb8f

Browse files
authored
reexport PyAnyMethods and friends from pyo3::types (#3895)
* reexport `PyAnyMethods` and friends from `pyo3::types` * remove duplicated imports
1 parent 0f29fec commit c06bb8f

File tree

3 files changed

+21
-24
lines changed

3 files changed

+21
-24
lines changed

src/conversions/indexmap.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@
8787
//! # if another hash table was used, the order could be random
8888
//! ```
8989
90-
use crate::types::any::PyAnyMethods;
91-
use crate::types::dict::PyDictMethods;
9290
use crate::types::*;
9391
use crate::{Bound, FromPyObject, IntoPy, PyErr, PyObject, Python, ToPyObject};
9492
use std::{cmp, hash};
@@ -137,8 +135,6 @@ where
137135
#[cfg(test)]
138136
mod test_indexmap {
139137

140-
use crate::types::any::PyAnyMethods;
141-
use crate::types::dict::PyDictMethods;
142138
use crate::types::*;
143139
use crate::{IntoPy, PyObject, Python, ToPyObject};
144140

src/prelude.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ pub use crate::types::mapping::PyMappingMethods;
3939
pub use crate::types::module::PyModuleMethods;
4040
pub use crate::types::sequence::PySequenceMethods;
4141
pub use crate::types::set::PySetMethods;
42+
pub use crate::types::slice::PySliceMethods;
4243
pub use crate::types::string::PyStringMethods;
4344
pub use crate::types::traceback::PyTracebackMethods;
4445
pub use crate::types::tuple::PyTupleMethods;

src/types/mod.rs

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
//! Various types defined by the Python interpreter such as `int`, `str` and `tuple`.
22
3-
pub use self::any::PyAny;
4-
pub use self::boolobject::PyBool;
5-
pub use self::bytearray::PyByteArray;
6-
pub use self::bytes::PyBytes;
7-
pub use self::capsule::PyCapsule;
3+
pub use self::any::{PyAny, PyAnyMethods};
4+
pub use self::boolobject::{PyBool, PyBoolMethods};
5+
pub use self::bytearray::{PyByteArray, PyByteArrayMethods};
6+
pub use self::bytes::{PyBytes, PyBytesMethods};
7+
pub use self::capsule::{PyCapsule, PyCapsuleMethods};
88
#[cfg(not(Py_LIMITED_API))]
99
pub use self::code::PyCode;
10-
pub use self::complex::PyComplex;
10+
pub use self::complex::{PyComplex, PyComplexMethods};
1111
#[allow(deprecated)]
1212
#[cfg(not(Py_LIMITED_API))]
1313
pub use self::datetime::timezone_utc;
@@ -16,37 +16,37 @@ pub use self::datetime::{
1616
timezone_utc_bound, PyDate, PyDateAccess, PyDateTime, PyDelta, PyDeltaAccess, PyTime,
1717
PyTimeAccess, PyTzInfo, PyTzInfoAccess,
1818
};
19-
pub use self::dict::{IntoPyDict, PyDict};
19+
pub use self::dict::{IntoPyDict, PyDict, PyDictMethods};
2020
#[cfg(not(PyPy))]
2121
pub use self::dict::{PyDictItems, PyDictKeys, PyDictValues};
2222
pub use self::ellipsis::PyEllipsis;
23-
pub use self::float::PyFloat;
23+
pub use self::float::{PyFloat, PyFloatMethods};
2424
#[cfg(all(not(Py_LIMITED_API), not(PyPy)))]
2525
pub use self::frame::PyFrame;
26-
pub use self::frozenset::{PyFrozenSet, PyFrozenSetBuilder};
26+
pub use self::frozenset::{PyFrozenSet, PyFrozenSetBuilder, PyFrozenSetMethods};
2727
pub use self::function::PyCFunction;
2828
#[cfg(all(not(Py_LIMITED_API), not(PyPy)))]
2929
pub use self::function::PyFunction;
3030
pub use self::iterator::PyIterator;
31-
pub use self::list::PyList;
32-
pub use self::mapping::PyMapping;
31+
pub use self::list::{PyList, PyListMethods};
32+
pub use self::mapping::{PyMapping, PyMappingMethods};
3333
pub use self::memoryview::PyMemoryView;
34-
pub use self::module::PyModule;
34+
pub use self::module::{PyModule, PyModuleMethods};
3535
pub use self::none::PyNone;
3636
pub use self::notimplemented::PyNotImplemented;
3737
pub use self::num::PyLong;
3838
pub use self::num::PyLong as PyInt;
3939
#[cfg(not(PyPy))]
4040
pub use self::pysuper::PySuper;
41-
pub use self::sequence::PySequence;
42-
pub use self::set::PySet;
43-
pub use self::slice::{PySlice, PySliceIndices};
41+
pub use self::sequence::{PySequence, PySequenceMethods};
42+
pub use self::set::{PySet, PySetMethods};
43+
pub use self::slice::{PySlice, PySliceIndices, PySliceMethods};
4444
#[cfg(not(Py_LIMITED_API))]
4545
pub use self::string::PyStringData;
46-
pub use self::string::{PyString, PyString as PyUnicode};
47-
pub use self::traceback::PyTraceback;
48-
pub use self::tuple::PyTuple;
49-
pub use self::typeobject::PyType;
46+
pub use self::string::{PyString, PyString as PyUnicode, PyStringMethods};
47+
pub use self::traceback::{PyTraceback, PyTracebackMethods};
48+
pub use self::tuple::{PyTuple, PyTupleMethods};
49+
pub use self::typeobject::{PyType, PyTypeMethods};
5050

5151
/// Iteration over Python collections.
5252
///
@@ -332,7 +332,7 @@ mod num;
332332
mod pysuper;
333333
pub(crate) mod sequence;
334334
pub(crate) mod set;
335-
mod slice;
335+
pub(crate) mod slice;
336336
pub(crate) mod string;
337337
pub(crate) mod traceback;
338338
pub(crate) mod tuple;

0 commit comments

Comments
 (0)