Remove new_bytearray

Author: youknowone

vm/src/builtins/bytearray.rs

@@ -55,6 +55,10 @@ pub struct PyByteArray {
 pub type PyByteArrayRef = PyRef<PyByteArray>;
 
 impl PyByteArray {
+    pub fn new_ref(data: Vec<u8>, ctx: &PyContext) -> PyRef<Self> {
+        PyRef::new_ref(Self::from(data), ctx.types.bytearray_type.clone(), None)
+    }
+
     fn from_inner(inner: PyBytesInner) -> Self {
         PyByteArray {
             inner: PyRwLock::new(inner),
@@ -146,8 +150,8 @@ impl PyByteArray {
     }
 
     #[pymethod(magic)]
-    fn add(&self, other: ArgBytesLike, vm: &VirtualMachine) -> PyObjectRef {
-        vm.ctx.new_bytearray(self.inner().add(&*other.borrow_buf()))
+    fn add(&self, other: ArgBytesLike) -> Self {
+        self.inner().add(&*other.borrow_buf()).into()
     }
 
     #[pymethod(magic)]
@@ -524,14 +528,20 @@ impl PyByteArray {
 
     #[pymethod]
     fn split(&self, options: ByteInnerSplitOptions, vm: &VirtualMachine) -> PyResult {
-        self.inner()
-            .split(options, |s, vm| vm.ctx.new_bytearray(s.to_vec()), vm)
+        self.inner().split(
+            options,
+            |s, vm| Self::new_ref(s.to_vec(), &vm.ctx).into(),
+            vm,
+        )
     }
 
     #[pymethod]
     fn rsplit(&self, options: ByteInnerSplitOptions, vm: &VirtualMachine) -> PyResult {
-        self.inner()
-            .rsplit(options, |s, vm| vm.ctx.new_bytearray(s.to_vec()), vm)
+        self.inner().rsplit(
+            options,
+            |s, vm| Self::new_ref(s.to_vec(), &vm.ctx).into(),
+            vm,
+        )
     }
 
     #[pymethod]
@@ -541,10 +551,9 @@ impl PyByteArray {
         let value = self.inner();
         let (front, has_mid, back) = value.partition(&sep, vm)?;
         Ok(vm.new_tuple((
-            vm.ctx.new_bytearray(front.to_vec()),
-            vm.ctx
-                .new_bytearray(if has_mid { sep.elements } else { Vec::new() }),
-            vm.ctx.new_bytearray(back.to_vec()),
+            Self::new_ref(front.to_vec(), &vm.ctx),
+            Self::new_ref(if has_mid { sep.elements } else { Vec::new() }, &vm.ctx),
+            Self::new_ref(back.to_vec(), &vm.ctx),
         )))
     }
 
@@ -553,10 +562,9 @@ impl PyByteArray {
         let value = self.inner();
         let (back, has_mid, front) = value.rpartition(&sep, vm)?;
         Ok(vm.new_tuple((
-            vm.ctx.new_bytearray(front.to_vec()),
-            vm.ctx
-                .new_bytearray(if has_mid { sep.elements } else { Vec::new() }),
-            vm.ctx.new_bytearray(back.to_vec()),
+            Self::new_ref(front.to_vec(), &vm.ctx),
+            Self::new_ref(if has_mid { sep.elements } else { Vec::new() }, &vm.ctx),
+            Self::new_ref(back.to_vec(), &vm.ctx),
         )))
     }
 
@@ -569,7 +577,7 @@ impl PyByteArray {
     fn splitlines(&self, options: anystr::SplitLinesArgs, vm: &VirtualMachine) -> PyObjectRef {
         let lines = self
             .inner()
-            .splitlines(options, |x| vm.ctx.new_bytearray(x.to_vec()));
+            .splitlines(options, |x| Self::new_ref(x.to_vec(), &vm.ctx).into());
         vm.ctx.new_list(lines)
     }
 

vm/src/pyobject.rs

@@ -7,7 +7,7 @@ pub use crate::pyobjectrc::{PyObject, PyObjectRef, PyObjectWeak, PyObjectWrap, P
 use crate::{
     builtins::{
         builtinfunc::{PyBuiltinFunction, PyBuiltinMethod, PyNativeFuncDef},
-        bytearray, bytes,
+        bytes,
         getset::{IntoPyGetterFunc, IntoPySetterFunc, PyGetSet},
         object, pystr, PyBaseExceptionRef, PyBoundMethod, PyDict, PyDictRef, PyEllipsis, PyFloat,
         PyFrozenSet, PyInt, PyIntRef, PyList, PyNone, PyNotImplemented, PyStr, PyTuple, PyTupleRef,
@@ -209,14 +209,6 @@ impl PyContext {
         )
     }
 
-    pub fn new_bytearray(&self, data: Vec<u8>) -> PyObjectRef {
-        PyObject::new(
-            bytearray::PyByteArray::from(data),
-            self.types.bytearray_type.clone(),
-            None,
-        )
-    }
-
     #[inline]
     pub fn new_bool(&self, b: bool) -> PyIntRef {
         let value = if b {