Export common conversion parameter type IntoPy*

youknowone · youknowone · commit 540b9c316a6f · 2021-09-22T03:38:09.000+09:00
diff --git a/vm/src/builtins/mod.rs b/vm/src/builtins/mod.rs
@@ -12,7 +12,7 @@ pub use classmethod::PyClassMethod;
 pub(crate) mod code;
 pub use code::PyCode;
 pub(crate) mod complex;
-pub use complex::PyComplex;
+pub use complex::{IntoPyComplex, PyComplex};
 pub(crate) mod coroutine;
 pub use coroutine::PyCoroutine;
 pub mod dict;
@@ -22,7 +22,7 @@ pub use enumerate::PyEnumerate;
 pub(crate) mod filter;
 pub use filter::PyFilter;
 pub(crate) mod float;
-pub use float::{PyFloat, PyFloatRef};
+pub use float::{IntoPyFloat, PyFloat, PyFloatRef};
 pub(crate) mod frame;
 pub(crate) mod function;
 pub use function::PyFunction;
@@ -65,7 +65,7 @@ pub use set::PySet;
 pub(crate) mod singletons;
 pub use singletons::{PyNone, PyNotImplemented};
 pub(crate) mod slice;
-pub use slice::PySlice;
+pub use slice::{PySlice, PySliceRef};
 pub(crate) mod staticmethod;
 pub use staticmethod::PyStaticMethod;
 pub(crate) mod traceback;
diff --git a/vm/src/cformat.rs b/vm/src/cformat.rs
@@ -2,9 +2,7 @@
 //! [https://docs.python.org/3/library/stdtypes.html#printf-style-string-formatting]
 
 use crate::buffer::PyBuffer;
-use crate::builtins::{
-    float::IntoPyFloat, int, try_f64_to_bigint, tuple, PyBytes, PyFloat, PyInt, PyStr,
-};
+use crate::builtins::{int, try_f64_to_bigint, tuple, IntoPyFloat, PyBytes, PyFloat, PyInt, PyStr};
 use crate::common::float_ops;
 use crate::{
     ItemProtocol, PyObjectRef, PyResult, TryFromBorrowedObject, TryFromObject, TypeProtocol,
diff --git a/vm/src/stdlib/array.rs b/vm/src/stdlib/array.rs
@@ -10,11 +10,11 @@ pub type wchar_t = u32;
 #[pymodule(name = "array")]
 mod array {
     use crate::buffer::{BufferOptions, PyBuffer, PyBufferInternal, ResizeGuard};
-    use crate::builtins::float::IntoPyFloat;
     use crate::builtins::list::{PyList, PyListRef};
     use crate::builtins::pystr::{PyStr, PyStrRef};
     use crate::builtins::pytype::PyTypeRef;
     use crate::builtins::slice::PySliceRef;
+    use crate::builtins::IntoPyFloat;
     use crate::builtins::{PyByteArray, PyBytes, PyBytesRef, PyIntRef};
     use crate::byteslike::ArgBytesLike;
     use crate::common::borrow::{BorrowedValue, BorrowedValueMut};
diff --git a/vm/src/stdlib/cmath.rs b/vm/src/stdlib/cmath.rs
@@ -22,7 +22,7 @@ pub(crate) fn make_module(vm: &VirtualMachine) -> PyObjectRef {
 /// This module provides access to mathematical functions for complex numbers.
 #[pymodule]
 mod cmath {
-    use crate::builtins::{complex::IntoPyComplex, float::IntoPyFloat};
+    use crate::builtins::{IntoPyComplex, IntoPyFloat};
     use crate::function::OptionalArg;
     use crate::{PyResult, VirtualMachine};
     use num_complex::Complex64;
diff --git a/vm/src/stdlib/math.rs b/vm/src/stdlib/math.rs
@@ -8,7 +8,7 @@ use num_traits::{One, Signed, Zero};
 use puruspe::{erf, erfc, gamma, ln_gamma};
 
 use crate::builtins::{
-    float::IntoPyFloat, try_bigint_to_f64, try_f64_to_bigint, PyFloatRef, PyInt, PyIntRef,
+    try_bigint_to_f64, try_f64_to_bigint, IntoPyFloat, PyFloatRef, PyInt, PyIntRef,
 };
 use crate::function::{Args, OptionalArg};
 use crate::utils::Either;
