Use PyBytesLike rather than PyBytesInner

youknowone · youknowone · commit caa25c5b39f6 · 2020-07-27T08:51:25.000+09:00
diff --git a/vm/src/builtins.rs b/vm/src/builtins.rs
@@ -14,7 +14,7 @@ mod decl {
     use rustpython_parser::parser;
 
     use super::to_ascii;
-    use crate::bytesinner::PyBytesInner;
+    use crate::byteslike::PyBytesLike;
     use crate::exceptions::PyBaseExceptionRef;
     use crate::function::{single_or_tuple_any, Args, KwArgs, OptionalArg, PyFuncArgs};
     use crate::obj::objbool::{self, IntoPyBool};
@@ -554,18 +554,18 @@ mod decl {
     }
 
     #[pyfunction]
-    fn ord(string: Either<PyBytesInner, PyStringRef>, vm: &VirtualMachine) -> PyResult<u32> {
+    fn ord(string: Either<PyBytesLike, PyStringRef>, vm: &VirtualMachine) -> PyResult<u32> {
         match string {
-            Either::A(bytes) => {
-                let bytes_len = bytes.elements.len();
+            Either::A(bytes) => bytes.with_ref(|bytes| {
+                let bytes_len = bytes.len();
                 if bytes_len != 1 {
                     return Err(vm.new_type_error(format!(
                         "ord() expected a character, but string of length {} found",
                         bytes_len
                     )));
                 }
-                Ok(u32::from(bytes.elements[0]))
-            }
+                Ok(u32::from(bytes[0]))
+            }),
             Either::B(string) => {
                 let string = string.as_str();
                 let string_len = string.chars().count();
diff --git a/vm/src/bytesinner.rs b/vm/src/bytesinner.rs
@@ -44,7 +44,7 @@ impl TryFromObject for PyBytesInner {
             k @ PyMemoryView => Ok(PyBytesInner {
                 elements: k.try_value().unwrap()
             }),
-            l @ PyList => l.get_byte_inner(vm),
+            l @ PyList => l.to_byte_inner(vm),
             obj => {
                 let iter = vm.get_method_or_type_error(obj.clone(), "__iter__", || {
                     format!("a bytes-like object is required, not {}", obj.class())
diff --git a/vm/src/obj/objint.rs b/vm/src/obj/objint.rs
@@ -12,7 +12,7 @@ use super::objfloat;
 use super::objmemory::PyMemoryView;
 use super::objstr::{PyString, PyStringRef};
 use super::objtype::{self, PyClassRef};
-use crate::bytesinner::PyBytesInner;
+use crate::byteslike::PyBytesLike;
 use crate::format::FormatSpec;
 use crate::function::{OptionalArg, PyFuncArgs};
 use crate::pyobject::{
@@ -554,14 +554,14 @@ impl PyInt {
         };
 
         let x = match args.byteorder.as_str() {
-            "big" => match signed {
-                true => BigInt::from_signed_bytes_be(&args.bytes.elements),
-                false => BigInt::from_bytes_be(Sign::Plus, &args.bytes.elements),
-            },
-            "little" => match signed {
-                true => BigInt::from_signed_bytes_le(&args.bytes.elements),
-                false => BigInt::from_bytes_le(Sign::Plus, &args.bytes.elements),
-            },
+            "big" => args.bytes.with_ref(|bytes| match signed {
+                true => BigInt::from_signed_bytes_be(bytes),
+                false => BigInt::from_bytes_be(Sign::Plus, bytes),
+            }),
+            "little" => args.bytes.with_ref(|bytes| match signed {
+                true => BigInt::from_signed_bytes_le(bytes),
+                false => BigInt::from_bytes_le(Sign::Plus, bytes),
+            }),
             _ => {
                 return Err(
                     vm.new_value_error("byteorder must be either 'little' or 'big'".to_owned())
@@ -714,7 +714,7 @@ impl IntOptions {
 #[derive(FromArgs)]
 struct IntFromByteArgs {
     #[pyarg(positional_or_keyword)]
-    bytes: PyBytesInner,
+    bytes: PyBytesLike,
     #[pyarg(positional_or_keyword)]
     byteorder: PyStringRef,
     #[pyarg(keyword_only, optional = true)]
diff --git a/vm/src/obj/objlist.rs b/vm/src/obj/objlist.rs
@@ -62,7 +62,7 @@ impl PyList {
         self.elements.write()
     }
 
-    pub(crate) fn get_byte_inner(&self, vm: &VirtualMachine) -> PyResult<bytesinner::PyBytesInner> {
+    pub(crate) fn to_byte_inner(&self, vm: &VirtualMachine) -> PyResult<bytesinner::PyBytesInner> {
         let mut elements = Vec::<u8>::with_capacity(self.borrow_elements().len());
         for elem in self.borrow_elements().iter() {
             match PyIntRef::try_from_object(vm, elem.clone()) {

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ impl PyList {`
`62`	`62`	`self.elements.write()`
`63`	`63`	`}`
`64`	`64`
`65`		`- pub(crate) fn get_byte_inner(&self, vm: &VirtualMachine) -> PyResult<bytesinner::PyBytesInner> {`
	`65`	`+ pub(crate) fn to_byte_inner(&self, vm: &VirtualMachine) -> PyResult<bytesinner::PyBytesInner> {`
`66`	`66`	`let mut elements = Vec::<u8>::with_capacity(self.borrow_elements().len());`
`67`	`67`	`for elem in self.borrow_elements().iter() {`
`68`	`68`	`match PyIntRef::try_from_object(vm, elem.clone()) {`