Fix UnpackIterator constructor

youknowone · youknowone · commit ad3b83618e35 · 2025-06-22T17:40:28.000+09:00
diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py
@@ -818,8 +818,6 @@ def _check_iterator(it):
         with self.assertRaises(struct.error):
             s.iter_unpack(b"12")
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_uninstantiable(self):
         iter_unpack_type = type(struct.Struct(">ibcp").iter_unpack(b""))
         self.assertRaises(TypeError, iter_unpack_type)
diff --git a/stdlib/src/pystruct.rs b/stdlib/src/pystruct.rs
@@ -16,7 +16,7 @@ pub(crate) mod _struct {
         function::{ArgBytesLike, ArgMemoryBuffer, PosArgs},
         match_class,
         protocol::PyIterReturn,
-        types::{Constructor, IterNext, Iterable, Representable, SelfIter},
+        types::{Constructor, IterNext, Iterable, Representable, SelfIter, Unconstructible},
     };
     use crossbeam_utils::atomic::AtomicCell;
 
@@ -163,7 +163,7 @@ pub(crate) mod _struct {
     }
 
     impl UnpackIterator {
-        fn new(
+        fn with_buffer(
             vm: &VirtualMachine,
             format_spec: FormatSpec,
             buffer: ArgBytesLike,
@@ -191,14 +191,15 @@ pub(crate) mod _struct {
         }
     }
 
-    #[pyclass(with(IterNext, Iterable))]
+    #[pyclass(with(Unconstructible, IterNext, Iterable))]
     impl UnpackIterator {
         #[pymethod(magic)]
         fn length_hint(&self) -> usize {
             self.buffer.len().saturating_sub(self.offset.load()) / self.format_spec.size
         }
     }
     impl SelfIter for UnpackIterator {}
+    impl Unconstructible for UnpackIterator {}
     impl IterNext for UnpackIterator {
         fn next(zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<PyIterReturn> {
             let size = zelf.format_spec.size;
@@ -222,7 +223,7 @@ pub(crate) mod _struct {
         vm: &VirtualMachine,
     ) -> PyResult<UnpackIterator> {
         let format_spec = fmt.format_spec(vm)?;
-        UnpackIterator::new(vm, format_spec, buffer)
+        UnpackIterator::with_buffer(vm, format_spec, buffer)
     }
 
     #[pyfunction]
@@ -302,7 +303,7 @@ pub(crate) mod _struct {
             buffer: ArgBytesLike,
             vm: &VirtualMachine,
         ) -> PyResult<UnpackIterator> {
-            UnpackIterator::new(vm, self.spec.clone(), buffer)
+            UnpackIterator::with_buffer(vm, self.spec.clone(), buffer)
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ pub(crate) mod _struct {`
`16`	`16`	`function::{ArgBytesLike, ArgMemoryBuffer, PosArgs},`
`17`	`17`	`match_class,`
`18`	`18`	`protocol::PyIterReturn,`
`19`		`- types::{Constructor, IterNext, Iterable, Representable, SelfIter},`
	`19`	`+ types::{Constructor, IterNext, Iterable, Representable, SelfIter, Unconstructible},`
`20`	`20`	`};`
`21`	`21`	`use crossbeam_utils::atomic::AtomicCell;`
`22`	`22`
`@@ -163,7 +163,7 @@ pub(crate) mod _struct {`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`impl UnpackIterator {`
`166`		`- fn new(`
	`166`	`+ fn with_buffer(`
`167`	`167`	`vm: &VirtualMachine,`
`168`	`168`	`format_spec: FormatSpec,`
`169`	`169`	`buffer: ArgBytesLike,`
`@@ -191,14 +191,15 @@ pub(crate) mod _struct {`
`191`	`191`	`}`
`192`	`192`	`}`
`193`	`193`
`194`		`- #[pyclass(with(IterNext, Iterable))]`
	`194`	`+ #[pyclass(with(Unconstructible, IterNext, Iterable))]`
`195`	`195`	`impl UnpackIterator {`
`196`	`196`	`#[pymethod(magic)]`
`197`	`197`	`fn length_hint(&self) -> usize {`
`198`	`198`	`self.buffer.len().saturating_sub(self.offset.load()) / self.format_spec.size`
`199`	`199`	`}`
`200`	`200`	`}`
`201`	`201`	`impl SelfIter for UnpackIterator {}`
	`202`	`+ impl Unconstructible for UnpackIterator {}`
`202`	`203`	`impl IterNext for UnpackIterator {`
`203`	`204`	`fn next(zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<PyIterReturn> {`
`204`	`205`	`let size = zelf.format_spec.size;`
`@@ -222,7 +223,7 @@ pub(crate) mod _struct {`
`222`	`223`	`vm: &VirtualMachine,`
`223`	`224`	`) -> PyResult<UnpackIterator> {`
`224`	`225`	`let format_spec = fmt.format_spec(vm)?;`
`225`		`- UnpackIterator::new(vm, format_spec, buffer)`
	`226`	`+ UnpackIterator::with_buffer(vm, format_spec, buffer)`
`226`	`227`	`}`
`227`	`228`
`228`	`229`	`#[pyfunction]`
`@@ -302,7 +303,7 @@ pub(crate) mod _struct {`
`302`	`303`	`buffer: ArgBytesLike,`
`303`	`304`	`vm: &VirtualMachine,`
`304`	`305`	`) -> PyResult<UnpackIterator> {`
`305`		`- UnpackIterator::new(vm, self.spec.clone(), buffer)`
	`306`	`+ UnpackIterator::with_buffer(vm, self.spec.clone(), buffer)`
`306`	`307`	`}`
`307`	`308`	`}`
`308`	`309`