From a42447bfe2bf25a948cc325342147c3e8e7beb8f Mon Sep 17 00:00:00 2001 From: R2D2 Date: Sat, 31 Jul 2021 21:20:57 +0200 Subject: [PATCH] Small refactor --- pyo3-macros-backend/src/from_pyobject.rs | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pyo3-macros-backend/src/from_pyobject.rs b/pyo3-macros-backend/src/from_pyobject.rs index 580ec980..d4aee920 100644 --- a/pyo3-macros-backend/src/from_pyobject.rs +++ b/pyo3-macros-backend/src/from_pyobject.rs @@ -58,13 +58,13 @@ impl<'a> Enum<'a> { let maybe_ret = || -> pyo3::PyResult { #struct_derive }(); - if maybe_ret.is_ok() { - return maybe_ret - } - if let Err(inner) = maybe_ret { - let gil = Python::acquire_gil(); - let py = gil.python(); - err_reasons.push_str(&format!("{}\n", inner.instance(py).str().unwrap())); + match maybe_ret { + ok @ Ok(_) => return ok, + Err(inner) => { + let gil = Python::acquire_gil(); + let py = gil.python(); + err_reasons.push_str(&format!("{}\n", inner.instance(py).str().unwrap())); + } } ); @@ -83,7 +83,6 @@ impl<'a> Enum<'a> { quote!( let mut err_reasons = String::new(); #(#var_extracts)* - let type_name = obj.get_type().name()?; let err_msg = format!("failed to extract enum {} ('{}')\n{}", #ty_name, #error_names,