Remove unwrap

Author: chrisrink10

src/singledispatch/builtins.rs

@@ -39,7 +39,7 @@ impl Builtins {
     ) -> PyResult<bool> {
         let args = PyTuple::new(py, [cls, typ]);
         match self.issubclass_func.call1(py, args?) {
-            Ok(result) => Ok(result.downcast_bound::<PyBool>(py).unwrap().is_true()),
+            Ok(result) => Ok(result.downcast_bound::<PyBool>(py)?.is_true()),
             Err(e) => Err(e),
         }
     }

src/singledispatch/core.rs

@@ -29,7 +29,7 @@ fn valid_dispatch_types(py: Python, cls: &Bound<'_, PyAny>) -> PyResult<Vec<Py<P
     } else {
         let typing_module = TypingModule::cached(py);
         if let Ok(origin) = typing_module.get_origin(py, cls) {
-            if typing_module.is_union_type(py, origin.bind(py)) {
+            if typing_module.is_union_type(py, origin.bind(py))? {
                 if let Ok(type_args) = typing_module.get_args(py, cls) {
                     let py_tuple = type_args.bind(py);
                     let mut dispatch_types = Vec::with_capacity(py_tuple.len());
@@ -74,7 +74,7 @@ struct SingleDispatchState {
 
 impl SingleDispatchState {
     fn find_impl(&mut self, py: Python, cls: Bound<'_, PyAny>) -> PyResult<PyObject> {
-        let cls_mro = get_obj_mro(&cls.clone()).unwrap();
+        let cls_mro = get_obj_mro(&cls.clone())?;
         let mro = match compose_mro(py, cls.clone(), self.registry.keys()) {
             Ok(mro) => mro,
             Err(e) => return Err(e),
@@ -166,7 +166,7 @@ impl SingleDispatch {
         match self.lock.lock() {
             Ok(mut state) => {
                 let unbound_func = func.unbind();
-                if typing_module.is_union_type(py, &cls) {
+                if typing_module.is_union_type(py, &cls)? {
                     match typing_module.get_args(py, &cls) {
                         Ok(tuple) => {
                             for tp in tuple.bind(py).iter() {

src/singledispatch/typing.rs

@@ -76,8 +76,8 @@ impl TypingModule {
         self.get_origin.call1(py, PyTuple::new(py, [cls])?)
     }
 
-    pub fn is_union_type(&self, py: Python, cls: &Bound<'_, PyAny>) -> bool {
-        let origin_type_reference = PyTypeReference::new(cls.into_py_any(py).unwrap());
-        self.union_types.contains(&origin_type_reference)
+    pub fn is_union_type(&self, py: Python, cls: &Bound<'_, PyAny>) -> PyResult<bool> {
+        let origin_type_reference = PyTypeReference::new(cls.into_py_any(py)?);
+        Ok(self.union_types.contains(&origin_type_reference))
     }
 }