From 7fd2f0b5e756a3ab9ef38b36bbb22bd91de6b393 Mon Sep 17 00:00:00 2001
From: Jeong YunWon <jeong@youknowone.org>
Date: Wed, 22 Sep 2021 02:57:37 +0900
Subject: [PATCH] expose more common interfaces

---
 vm/src/builtins/memory.rs | 2 +-
 vm/src/builtins/pystr.rs  | 2 +-
 vm/src/lib.rs             | 6 +++---
 vm/src/sliceable.rs       | 2 +-
 vm/src/stdlib/io.rs       | 2 +-
 vm/src/stdlib/posix.rs    | 2 +-
 vm/src/stdlib/pystruct.rs | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/vm/src/builtins/memory.rs b/vm/src/builtins/memory.rs
index 4e3f23218d..eaf8539c77 100644
--- 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
index e29939296b..38be33ecde 100644
--- a/vm/src/builtins/pystr.rs
+++ b/vm/src/builtins/pystr.rs
@@ -477,7 +477,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
index 5b089dafea..e0ee8068e9 100644
--- a/vm/src/lib.rs
+++ b/vm/src/lib.rs
@@ -60,7 +60,7 @@ mod frozen;
 pub mod function;
 pub mod import;
 pub mod iterator;
-mod protocol;
+pub mod protocol;
 pub mod py_io;
 pub mod py_serde;
 mod pyobject;
@@ -69,12 +69,12 @@ pub mod readline;
 pub mod scope;
 mod sequence;
 mod signal;
-mod sliceable;
+pub mod sliceable;
 pub mod slots;
 pub mod stdlib;
 pub mod types;
 pub mod utils;
-mod version;
+pub mod version;
 mod vm;
 
 // pub use self::Executor;
diff --git a/vm/src/sliceable.rs b/vm/src/sliceable.rs
index b366d9b4bf..0eb5fd1bea 100644
--- 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/io.rs b/vm/src/stdlib/io.rs
index 548b652058..ba705f7044 100644
--- a/vm/src/stdlib/io.rs
+++ b/vm/src/stdlib/io.rs
@@ -35,7 +35,7 @@ pub(crate) fn make_module(vm: &VirtualMachine) -> PyObjectRef {
 #[allow(unused)]
 #[derive(Copy, Clone)]
 #[repr(transparent)]
-pub(crate) struct Fildes(pub i32);
+pub struct Fildes(pub i32);
 
 impl TryFromObject for Fildes {
     fn try_from_object(vm: &VirtualMachine, obj: PyObjectRef) -> PyResult<Self> {
diff --git a/vm/src/stdlib/posix.rs b/vm/src/stdlib/posix.rs
index 90e3cc7f24..15961965a7 100644
--- a/vm/src/stdlib/posix.rs
+++ b/vm/src/stdlib/posix.rs
@@ -2,7 +2,7 @@ use crate::{PyObjectRef, PyResult, VirtualMachine};
 use nix;
 use std::os::unix::io::RawFd;
 
-pub(crate) fn raw_set_inheritable(fd: RawFd, inheritable: bool) -> nix::Result<()> {
+pub fn raw_set_inheritable(fd: RawFd, inheritable: bool) -> nix::Result<()> {
     use nix::fcntl;
     let flags = fcntl::FdFlag::from_bits_truncate(fcntl::fcntl(fd, fcntl::FcntlArg::F_GETFD)?);
     let mut new_flags = flags;
diff --git a/vm/src/stdlib/pystruct.rs b/vm/src/stdlib/pystruct.rs
index a85a0f3f7d..085f73f92d 100644
--- a/vm/src/stdlib/pystruct.rs
+++ b/vm/src/stdlib/pystruct.rs
@@ -966,4 +966,4 @@ pub(crate) mod _struct {
     }
 }
 
-pub(crate) use _struct::make_module;
+pub(crate) use _struct::{make_module, FormatSpec};