fix clippy

qingshi163 · qingshi163 · commit 5b3cb4374c16 · 2020-10-11T20:28:06.000+02:00
diff --git a/vm/src/obj/objlist.rs b/vm/src/obj/objlist.rs
@@ -4,13 +4,10 @@ use std::mem::size_of;
 use std::ops::DerefMut;
 
 use crossbeam_utils::atomic::AtomicCell;
-use num_traits::ToPrimitive;
 
-use super::objint::PyIntRef;
 use super::objiter;
 use super::objslice::PySliceRef;
 use super::objtype::PyTypeRef;
-use crate::bytesinner;
 use crate::common::lock::{PyRwLock, PyRwLockReadGuard, PyRwLockWriteGuard};
 use crate::function::OptionalArg;
 use crate::pyobject::{
@@ -71,25 +68,6 @@ impl PyList {
     pub fn borrow_value_mut(&self) -> PyRwLockWriteGuard<'_, Vec<PyObjectRef>> {
         self.elements.write()
     }
-
-    // TODO: more generic way to do so
-    pub(crate) fn to_byte_inner(&self, vm: &VirtualMachine) -> PyResult<bytesinner::PyBytesInner> {
-        let mut elements = Vec::<u8>::with_capacity(self.borrow_value().len());
-        for elem in self.borrow_value().iter() {
-            let py_int = PyIntRef::try_from_object(vm, elem.clone()).map_err(|_| {
-                vm.new_type_error(format!(
-                    "'{}' object cannot be interpreted as an integer",
-                    elem.class().name
-                ))
-            })?;
-            let result = py_int
-                .borrow_value()
-                .to_u8()
-                .ok_or_else(|| vm.new_value_error("bytes must be in range (0, 256)".to_owned()))?;
-            elements.push(result);
-        }
-        Ok(elements.into())
-    }
 }
 
 #[derive(FromArgs, Default)]
diff --git a/vm/src/obj/objtuple.rs b/vm/src/obj/objtuple.rs
@@ -1,21 +1,18 @@
 use crossbeam_utils::atomic::AtomicCell;
-use num_traits::ToPrimitive;
 use std::fmt;
 
-use super::objint::PyIntRef;
 use super::objiter;
 use super::objtype::PyTypeRef;
 use crate::common::hash::PyHash;
+use crate::function::OptionalArg;
 use crate::pyobject::{
     self, BorrowValue, Either, IdProtocol, IntoPyObject, PyArithmaticValue, PyClassImpl,
-    PyComparisonValue, PyContext, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject,
-    TypeProtocol,
+    PyComparisonValue, PyContext, PyObjectRef, PyRef, PyResult, PyValue, TypeProtocol,
 };
 use crate::sequence::{self, SimpleSeq};
 use crate::sliceable::PySliceableSequence;
 use crate::slots::{Comparable, Hashable, PyComparisonOp};
 use crate::vm::{ReprGuard, VirtualMachine};
-use crate::{bytesinner::PyBytesInner, function::OptionalArg};
 
 /// tuple() -> empty tuple
 /// tuple(iterable) -> tuple initialized from iterable's items
@@ -69,25 +66,6 @@ impl PyTuple {
     pub(crate) fn fast_getitem(&self, idx: usize) -> PyObjectRef {
         self.elements[idx].clone()
     }
-
-    // TODO: more generic way to do so
-    pub(crate) fn to_bytes_inner(&self, vm: &VirtualMachine) -> PyResult<PyBytesInner> {
-        let mut elements = Vec::<u8>::with_capacity(self.borrow_value().len());
-        for elem in self.borrow_value().iter() {
-            let py_int = PyIntRef::try_from_object(vm, elem.clone()).map_err(|_| {
-                vm.new_type_error(format!(
-                    "'{}' object cannot be interpreted as an integer",
-                    elem.class().name
-                ))
-            })?;
-            let result = py_int
-                .borrow_value()
-                .to_u8()
-                .ok_or_else(|| vm.new_value_error("bytes must be in range (0, 256)".to_owned()))?;
-            elements.push(result);
-        }
-        Ok(elements.into())
-    }
 }
 
 pub type PyTupleRef = PyRef<PyTuple>;
