luxolus/pyo3
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Small refactor

Browse source
This commit is contained in:
R2D2 2021-07-31 21:20:57 +02:00
parent 363383ea84
commit a42447bfe2
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pyo3-macros-backend/src/from_pyobject.rs
View file

@ -58,13 +58,13 @@ impl<'a> Enum<'a> {
let maybe_ret = || -> pyo3::PyResult<Self> {
#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,