change TryIntoRef return type from PyResult<PyRef> to PyRef

Author: youknowone

vm/src/builtins/pystr.rs

@@ -171,22 +171,22 @@ impl fmt::Display for PyStr {
 
 impl TryIntoRef<PyStr> for AsciiString {
     #[inline]
-    fn try_into_ref(self, vm: &VirtualMachine) -> PyResult<PyRef<PyStr>> {
-        Ok(unsafe { PyStr::new_ascii_unchecked(self.into()) }.into_ref(vm))
+    fn try_into_ref(self, vm: &VirtualMachine) -> PyRef<PyStr> {
+        unsafe { PyStr::new_ascii_unchecked(self.into()) }.into_ref(vm)
     }
 }
 
 impl TryIntoRef<PyStr> for String {
     #[inline]
-    fn try_into_ref(self, vm: &VirtualMachine) -> PyResult<PyRef<PyStr>> {
-        Ok(PyStr::from(self).into_ref(vm))
+    fn try_into_ref(self, vm: &VirtualMachine) -> PyRef<PyStr> {
+        PyStr::from(self).into_ref(vm)
     }
 }
 
 impl TryIntoRef<PyStr> for &str {
     #[inline]
-    fn try_into_ref(self, vm: &VirtualMachine) -> PyResult<PyRef<PyStr>> {
-        Ok(PyStr::from(self).into_ref(vm))
+    fn try_into_ref(self, vm: &VirtualMachine) -> PyRef<PyStr> {
+        PyStr::from(self).into_ref(vm)
     }
 }
 

vm/src/pyobject.rs

@@ -408,8 +408,8 @@ impl<T: PyValue> IntoPyObject for PyRefExact<T> {
     }
 }
 impl<T: PyValue> TryIntoRef<T> for PyRefExact<T> {
-    fn try_into_ref(self, _vm: &VirtualMachine) -> PyResult<PyRef<T>> {
-        Ok(self.obj)
+    fn try_into_ref(self, _vm: &VirtualMachine) -> PyRef<T> {
+        self.obj
     }
 }
 
@@ -616,13 +616,13 @@ impl<T: TryFromObject> TryFromObject for Option<T> {
 /// Allows coercion of a types into PyRefs, so that we can write functions that can take
 /// refs, pyobject refs or basic types.
 pub trait TryIntoRef<T: PyObjectPayload> {
-    fn try_into_ref(self, vm: &VirtualMachine) -> PyResult<PyRef<T>>;
+    fn try_into_ref(self, vm: &VirtualMachine) -> PyRef<T>;
 }
 
 impl<T: PyObjectPayload> TryIntoRef<T> for PyRef<T> {
     #[inline]
-    fn try_into_ref(self, _vm: &VirtualMachine) -> PyResult<PyRef<T>> {
-        Ok(self)
+    fn try_into_ref(self, _vm: &VirtualMachine) -> PyRef<T> {
+        self
     }
 }
 

vm/src/vm.rs

@@ -788,7 +788,7 @@ impl VirtualMachine {
     ) -> PyBaseExceptionRef {
         let import_error = self.ctx.exceptions.import_error.clone();
         let exc = self.new_exception_msg(import_error, msg);
-        self.set_attr(exc.as_object(), "name", name.try_into_ref(self).unwrap())
+        self.set_attr(exc.as_object(), "name", name.try_into_ref(self))
             .unwrap();
         exc
     }
@@ -921,7 +921,7 @@ impl VirtualMachine {
         from_list: Option<PyTupleTyped<PyStrRef>>,
         level: usize,
     ) -> PyResult {
-        self._import_inner(module.try_into_ref(self)?, from_list, level)
+        self._import_inner(module.try_into_ref(self), from_list, level)
     }
 
     fn _import_inner(
@@ -1366,7 +1366,7 @@ impl VirtualMachine {
     where
         T: TryIntoRef<PyStr>,
     {
-        let attr_name = attr_name.try_into_ref(self)?;
+        let attr_name = attr_name.try_into_ref(self);
         vm_trace!("vm.__getattribute__: {:?} {:?}", obj, attr_name);
         let getattro = obj
             .class()
@@ -1419,12 +1419,12 @@ impl VirtualMachine {
         K: TryIntoRef<PyStr>,
         V: Into<PyObjectRef>,
     {
-        let attr_name = attr_name.try_into_ref(self)?;
+        let attr_name = attr_name.try_into_ref(self);
         self.call_set_attr(obj, attr_name, Some(attr_value.into()))
     }
 
     pub fn del_attr(&self, obj: &PyObjectRef, attr_name: impl TryIntoRef<PyStr>) -> PyResult<()> {
-        let attr_name = attr_name.try_into_ref(self)?;
+        let attr_name = attr_name.try_into_ref(self);
         self.call_set_attr(obj, attr_name, None)
     }
 
@@ -2138,7 +2138,7 @@ impl VirtualMachine {
         attr_value: impl Into<PyObjectRef>,
     ) -> PyResult<()> {
         let val = attr_value.into();
-        object::setattr(module, attr_name.try_into_ref(self)?, Some(val), self)
+        object::setattr(module, attr_name.try_into_ref(self), Some(val), self)
     }
 }