expose more common interfaces

youknowone · youknowone · commit f9eedf5e3e91 · 2021-09-26T05:00:02.000+09:00
diff --git a/vm/src/builtins/memory.rs b/vm/src/builtins/memory.rs
@@ -11,7 +11,7 @@ use crate::{
     protocol::{BufferInternal, BufferOptions, PyBuffer},
     sliceable::{convert_slice, wrap_index, SequenceIndex},
     slots::{AsBuffer, Comparable, Hashable, PyComparisonOp, SlotConstructor},
-    stdlib::pystruct::_struct::FormatSpec,
+    stdlib::pystruct::FormatSpec,
     utils::Either,
     IdProtocol, IntoPyObject, PyClassImpl, PyComparisonValue, PyContext, PyObjectRef, PyRef,
     PyResult, PyValue, TryFromBorrowedObject, TryFromObject, TypeProtocol, VirtualMachine,
diff --git a/vm/src/builtins/pystr.rs b/vm/src/builtins/pystr.rs
@@ -475,7 +475,7 @@ impl PyStr {
     }
 
     #[pymethod(magic)]
-    pub(crate) fn repr(&self, vm: &VirtualMachine) -> PyResult<String> {
+    pub fn repr(&self, vm: &VirtualMachine) -> PyResult<String> {
         let in_len = self.byte_len();
         let mut out_len = 0usize;
         // let mut max = 127;
diff --git a/vm/src/lib.rs b/vm/src/lib.rs
@@ -68,7 +68,7 @@ mod pyobjectrc;
 pub mod readline;
 pub mod scope;
 mod sequence;
-mod sliceable;
+pub mod sliceable;
 pub mod slots;
 pub mod stdlib;
 pub mod sysmodule;
diff --git a/vm/src/sliceable.rs b/vm/src/sliceable.rs
@@ -404,7 +404,7 @@ pub(crate) fn wrap_index(p: isize, len: usize) -> Option<usize> {
 }
 
 // return pos is in range [0, len] inclusive
-pub(crate) fn saturate_index(p: isize, len: usize) -> usize {
+pub fn saturate_index(p: isize, len: usize) -> usize {
     let mut p = p;
     let len = len.to_isize().unwrap();
     if p < 0 {
diff --git a/vm/src/stdlib/pystruct.rs b/vm/src/stdlib/pystruct.rs
@@ -967,4 +967,4 @@ pub(crate) mod _struct {
     }
 }
 
-pub(crate) use _struct::make_module;
+pub(crate) use _struct::{make_module, FormatSpec};

Original file line number	Diff line number	Diff line change
`@@ -475,7 +475,7 @@ impl PyStr {`
`475`	`475`	`}`
`476`	`476`
`477`	`477`	`#[pymethod(magic)]`
`478`		`- pub(crate) fn repr(&self, vm: &VirtualMachine) -> PyResult<String> {`
	`478`	`+ pub fn repr(&self, vm: &VirtualMachine) -> PyResult<String> {`
`479`	`479`	`let in_len = self.byte_len();`
`480`	`480`	`let mut out_len = 0usize;`
`481`	`481`	`// let mut max = 127;`
Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,7 @@ pub(crate) fn wrap_index(p: isize, len: usize) -> Option<usize> {`
`404`	`404`	`}`
`405`	`405`
`406`	`406`	`// return pos is in range [0, len] inclusive`
`407`		`-pub(crate) fn saturate_index(p: isize, len: usize) -> usize {`
	`407`	`+pub fn saturate_index(p: isize, len: usize) -> usize {`
`408`	`408`	`let mut p = p;`
`409`	`409`	`let len = len.to_isize().unwrap();`
`410`	`410`	`if p < 0 {`
Original file line number	Diff line number	Diff line change
`@@ -967,4 +967,4 @@ pub(crate) mod _struct {`
`967`	`967`	`}`
`968`	`968`	`}`
`969`	`969`
`970`		`-pub(crate) use _struct::make_module;`
	`970`	`+pub(crate) use _struct::{make_module, FormatSpec};`