PyMemoryView::try_bytes take closure instead of returning vec

youknowone · youknowone · commit 81d4bc7f9fbd · 2020-07-27T05:45:34.000+09:00
diff --git a/vm/src/bytesinner.rs b/vm/src/bytesinner.rs
@@ -42,7 +42,7 @@ impl TryFromObject for PyBytesInner {
                 elements: j.borrow_value().elements.to_vec()
             }),
             k @ PyMemoryView => Ok(PyBytesInner {
-                elements: k.try_value().unwrap()
+                elements: k.try_bytes(|v| v.to_vec()).unwrap()
             }),
             l @ PyList => l.to_byte_inner(vm),
             obj => {
@@ -358,7 +358,7 @@ impl PyBytesInner {
                     .collect::<PyResult<Vec<_>>>()?)
             }
             _ => match_class!(match object {
-                i @ PyMemoryView => Ok(i.try_value().unwrap()),
+                i @ PyMemoryView => Ok(i.try_bytes(|v| v.to_vec()).unwrap()),
                 _ => Err(vm.new_index_error(
                     "can assign only bytes, buffers, or iterables of ints in range(0, 256)"
                         .to_owned()
diff --git a/vm/src/obj/objint.rs b/vm/src/obj/objint.rs
@@ -759,8 +759,7 @@ pub fn to_int(vm: &VirtualMachine, obj: &PyObjectRef, base: &BigInt) -> PyResult
         }
         memoryview @ PyMemoryView => {
             // TODO: proper error handling instead of `unwrap()`
-            let bytes = memoryview.try_value().unwrap();
-            bytes_to_int(&bytes)
+            memoryview.try_bytes(|bytes| bytes_to_int(&bytes)).unwrap()
         }
         array @ PyArray => {
             let bytes = array.tobytes();
diff --git a/vm/src/obj/objmemory.rs b/vm/src/obj/objmemory.rs
@@ -16,8 +16,11 @@ pub type PyMemoryViewRef = PyRef<PyMemoryView>;
 
 #[pyimpl]
 impl PyMemoryView {
-    pub fn try_value(&self) -> Option<Vec<u8>> {
-        try_as_bytes(self.obj_ref.clone(), |bytes| bytes.to_vec())
+    pub fn try_bytes<F, R>(&self, f: F) -> Option<R>
+    where
+        F: Fn(&[u8]) -> R,
+    {
+        try_as_bytes(self.obj_ref.clone(), f)
     }
 
     #[pyslot]

Original file line number	Diff line number	Diff line change
`@@ -759,8 +759,7 @@ pub fn to_int(vm: &VirtualMachine, obj: &PyObjectRef, base: &BigInt) -> PyResult`
`759`	`759`	`}`
`760`	`760`	`memoryview @ PyMemoryView => {`
`761`	`761`	// TODO: proper error handling instead of `unwrap()`
`762`		`- let bytes = memoryview.try_value().unwrap();`
`763`		`- bytes_to_int(&bytes)`
	`762`	`+ memoryview.try_bytes(\|bytes\| bytes_to_int(&bytes)).unwrap()`
`764`	`763`	`}`
`765`	`764`	`array @ PyArray => {`
`766`	`765`	`let bytes = array.tobytes();`