Move _struct module to stdlib

youknowone · youknowone · commit be9aaf71a6f8 · 2022-04-17T02:00:07.000+09:00
diff --git a/stdlib/src/lib.rs b/stdlib/src/lib.rs
@@ -17,6 +17,7 @@ mod json;
 mod math;
 mod platform;
 mod pyexpat;
+mod pystruct;
 mod random;
 // TODO: maybe make this an extension module, if we ever get those
 // mod re;
@@ -87,6 +88,7 @@ pub fn get_module_inits() -> impl Iterator<Item = (Cow<'static, str>, StdlibInit
             "_platform" => platform::make_module,
             "_random" => random::make_module,
             "_statistics" => statistics::make_module,
+            "_struct" => pystruct::make_module,
             "unicodedata" => unicodedata::make_module,
             "zlib" => zlib::make_module,
             // crate::vm::sysmodule::sysconfigdata_name() => sysconfigdata::make_module,
diff --git a/stdlib/src/pystruct.rs b/stdlib/src/pystruct.rs
@@ -6,15 +6,17 @@
 //! https://docs.rs/byteorder/1.2.6/byteorder/
 
 pub(crate) use _struct::make_module;
+
 #[pymodule]
 pub(crate) mod _struct {
-    use crate::{
+    use crate::vm::{
         buffer::{new_struct_error, struct_error_type, FormatSpec},
         builtins::{PyBytes, PyStr, PyStrRef, PyTupleRef, PyTypeRef},
         function::{ArgBytesLike, ArgMemoryBuffer, PosArgs},
+        match_class,
         protocol::PyIterReturn,
         types::{Constructor, IterNext, IterNextIterable},
-        PyObjectRef, PyResult, PyValue, TryFromObject, TypeProtocol, VirtualMachine,
+        PyObjectRef, PyObjectView, PyResult, PyValue, TryFromObject, TypeProtocol, VirtualMachine,
     };
     use crossbeam_utils::atomic::AtomicCell;
 
@@ -204,7 +206,7 @@ pub(crate) mod _struct {
     }
     impl IterNextIterable for UnpackIterator {}
     impl IterNext for UnpackIterator {
-        fn next(zelf: &crate::PyObjectView<Self>, vm: &VirtualMachine) -> PyResult<PyIterReturn> {
+        fn next(zelf: &PyObjectView<Self>, vm: &VirtualMachine) -> PyResult<PyIterReturn> {
             let size = zelf.format_spec.size;
             let offset = zelf.offset.fetch_add(size);
             zelf.buffer.with_ref(|buf| {
diff --git a/vm/src/buffer.rs b/vm/src/buffer.rs
@@ -309,8 +309,8 @@ pub struct FormatSpec {
     #[allow(dead_code)]
     pub(crate) endianness: Endianness,
     pub(crate) codes: Vec<FormatCode>,
-    pub(crate) size: usize,
-    pub(crate) arg_count: usize,
+    pub size: usize,
+    pub arg_count: usize,
 }
 
 impl FormatSpec {
diff --git a/vm/src/builtins/pystr.rs b/vm/src/builtins/pystr.rs
@@ -322,7 +322,7 @@ impl Constructor for PyStr {
 }
 
 impl PyStr {
-    /// SAFETY: Given 'bytes' must be valid data for given 'kind'
+    /// # Safety: Given `bytes` must be valid data for given `kind`
     pub(crate) unsafe fn new_str_unchecked(bytes: Vec<u8>, kind: PyStrKind) -> Self {
         let s = Self {
             bytes: bytes.into_boxed_slice(),
@@ -333,8 +333,9 @@ impl PyStr {
         s
     }
 
-    /// SAFETY: Given 'bytes' must be ascii
-    pub(crate) unsafe fn new_ascii_unchecked(bytes: Vec<u8>) -> Self {
+    /// # Safety
+    /// Given `bytes` must be ascii
+    pub unsafe fn new_ascii_unchecked(bytes: Vec<u8>) -> Self {
         Self::new_str_unchecked(bytes, PyStrKind::Ascii)
     }
 
diff --git a/vm/src/stdlib/mod.rs b/vm/src/stdlib/mod.rs
@@ -11,7 +11,6 @@ pub mod io;
 mod itertools;
 mod marshal;
 mod operator;
-pub(crate) mod pystruct;
 // TODO: maybe make this an extension module, if we ever get those
 // mod re;
 mod sre;
@@ -85,7 +84,6 @@ pub fn get_module_inits() -> StdlibMap {
             "_operator" => operator::make_module,
             "_sre" => sre::make_module,
             "_string" => string::make_module,
-            "_struct" => pystruct::make_module,
             "time" => time::make_module,
             "_weakref" => weakref::make_module,
             "_imp" => imp::make_module,

Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,7 @@ impl Constructor for PyStr {`
`322`	`322`	`}`
`323`	`323`
`324`	`324`	`impl PyStr {`
`325`		`- /// SAFETY: Given 'bytes' must be valid data for given 'kind'`
	`325`	+ /// # Safety: Given `bytes` must be valid data for given `kind`
`326`	`326`	`pub(crate) unsafe fn new_str_unchecked(bytes: Vec<u8>, kind: PyStrKind) -> Self {`
`327`	`327`	`let s = Self {`
`328`	`328`	`bytes: bytes.into_boxed_slice(),`
`@@ -333,8 +333,9 @@ impl PyStr {`
`333`	`333`	`s`
`334`	`334`	`}`
`335`	`335`
`336`		`- /// SAFETY: Given 'bytes' must be ascii`
`337`		`- pub(crate) unsafe fn new_ascii_unchecked(bytes: Vec<u8>) -> Self {`
	`336`	`+ /// # Safety`
	`337`	+ /// Given `bytes` must be ascii
	`338`	`+ pub unsafe fn new_ascii_unchecked(bytes: Vec<u8>) -> Self {`
`338`	`339`	`Self::new_str_unchecked(bytes, PyStrKind::Ascii)`
`339`	`340`	`}`
`340`	`341`