obj::pystr -> pystr

youknowone · youknowone · commit c07d3f09cd06 · 2020-07-27T08:38:57.000+09:00
diff --git a/vm/src/bytesinner.rs b/vm/src/bytesinner.rs
@@ -14,16 +14,16 @@ use crate::obj::objnone::PyNoneRef;
 use crate::obj::objsequence::{PySliceableSequence, SequenceIndex};
 use crate::obj::objslice::PySliceRef;
 use crate::obj::objstr::{self, PyString, PyStringRef};
-use crate::obj::pystr::{self, PyCommonString, PyCommonStringContainer, PyCommonStringWrapper};
 use crate::pyobject::{
     Either, PyComparisonValue, PyIterable, PyObjectRef, PyResult, TryFromObject, TypeProtocol,
 };
+use crate::pystr::{self, PyCommonString, PyCommonStringContainer, PyCommonStringWrapper};
 use crate::vm::VirtualMachine;
 use rustpython_common::hash;
 
 #[derive(Debug, Default, Clone)]
 pub struct PyBytesInner {
-    pub elements: Vec<u8>,
+    pub(crate) elements: Vec<u8>,
 }
 
 impl From<Vec<u8>> for PyBytesInner {
diff --git a/vm/src/lib.rs b/vm/src/lib.rs
@@ -70,6 +70,7 @@ pub mod import;
 pub mod obj;
 pub mod py_serde;
 pub mod pyobject;
+mod pystr;
 pub mod readline;
 pub mod scope;
 mod sequence;
diff --git a/vm/src/obj/mod.rs b/vm/src/obj/mod.rs
@@ -43,4 +43,3 @@ pub mod objtype;
 pub mod objweakproxy;
 pub mod objweakref;
 pub mod objzip;
-pub(super) mod pystr;
diff --git a/vm/src/obj/objbytearray.rs b/vm/src/obj/objbytearray.rs
@@ -1,5 +1,4 @@
 //! Implementation of the python bytearray object.
-use crate::common::cell::{PyRwLock, PyRwLockReadGuard, PyRwLockWriteGuard};
 use bstr::ByteSlice;
 use crossbeam_utils::atomic::AtomicCell;
 use num_traits::cast::ToPrimitive;
@@ -10,16 +9,17 @@ use super::objiter;
 use super::objsequence::SequenceIndex;
 use super::objstr::{PyString, PyStringRef};
 use super::objtype::PyClassRef;
-use super::pystr::{self, PyCommonString};
 use crate::bytesinner::{
     ByteInnerFindOptions, ByteInnerNewOptions, ByteInnerPaddingOptions, ByteInnerSplitOptions,
     ByteInnerTranslateOptions, ByteOr, PyBytesInner,
 };
+use crate::common::cell::{PyRwLock, PyRwLockReadGuard, PyRwLockWriteGuard};
 use crate::function::{OptionalArg, OptionalOption};
 use crate::pyobject::{
     Either, PyClassImpl, PyComparisonValue, PyContext, PyIterable, PyObjectRef, PyRef, PyResult,
     PyValue, TryFromObject, TypeProtocol,
 };
+use crate::pystr::{self, PyCommonString};
 use crate::vm::VirtualMachine;
 
 /// "bytearray(iterable_of_ints) -> bytearray\n\
diff --git a/vm/src/obj/objbytes.rs b/vm/src/obj/objbytes.rs
@@ -8,7 +8,6 @@ use super::objiter;
 use super::objsequence::SequenceIndex;
 use super::objstr::{PyString, PyStringRef};
 use super::objtype::PyClassRef;
-use super::pystr::{self, PyCommonString};
 use crate::bytesinner::{
     ByteInnerFindOptions, ByteInnerNewOptions, ByteInnerPaddingOptions, ByteInnerSplitOptions,
     ByteInnerTranslateOptions, PyBytesInner,
@@ -20,6 +19,7 @@ use crate::pyobject::{
     PyClassImpl, PyComparisonValue, PyContext, PyIterable, PyObjectRef, PyRef, PyResult, PyValue,
     TryFromObject, TypeProtocol,
 };
+use crate::pystr::{self, PyCommonString};
 use crate::vm::VirtualMachine;
 use rustpython_common::hash::PyHash;
 
diff --git a/vm/src/obj/objstr.rs b/vm/src/obj/objstr.rs
@@ -19,15 +19,15 @@ use super::objiter;
 use super::objnone::PyNone;
 use super::objsequence::{PySliceableSequence, SequenceIndex};
 use super::objtype::{self, PyClassRef};
-use super::pystr::{
-    self, adjust_indices, PyCommonString, PyCommonStringContainer, PyCommonStringWrapper,
-};
 use crate::format::{FormatParseError, FormatSpec, FormatString, FromTemplate};
 use crate::function::{OptionalArg, OptionalOption, PyFuncArgs};
 use crate::pyobject::{
     IdProtocol, IntoPyObject, ItemProtocol, PyClassImpl, PyContext, PyIterable, PyObjectRef, PyRef,
     PyResult, PyValue, TryFromObject, TryIntoRef, TypeProtocol,
 };
+use crate::pystr::{
+    self, adjust_indices, PyCommonString, PyCommonStringContainer, PyCommonStringWrapper,
+};
 use crate::vm::VirtualMachine;
 use rustpython_common::hash;
 
diff --git a/vm/src/pystr.rs b/vm/src/pystr.rs
