Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions guests/python/src/python_modules/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1564,7 +1564,7 @@ mod wit_world {
}

#[pyclass]
#[derive(Debug, IntoPyObject)]
#[derive(Debug)]
#[pyo3(extends = PyValueError, frozen, get_all, name = "Err", str)]
pub(crate) struct ErrWrapper {
value: Py<PyAny>,
Expand Down Expand Up @@ -1623,9 +1623,9 @@ mod wit_world {
#[derive(Debug, IntoPyObject)]
pub(crate) enum ResultWrapper {
#[pyo3(transparent)]
Ok(OkWrapper),
Ok(Py<OkWrapper>),
#[pyo3(transparent)]
Err(ErrWrapper),
Err(Py<ErrWrapper>),
}

impl ResultWrapper {
Expand All @@ -1635,26 +1635,30 @@ mod wit_world {
E: IntoPyObject<'py>,
{
let res = match res {
Ok(val) => Self::Ok(OkWrapper {
value: val
Ok(val) => {
let val = val
.into_pyobject(py)
.map_err(|e| {
let e: PyErr = e.into();
e
})?
.into_any()
.unbind(),
}),
Err(val) => Self::Err(ErrWrapper {
value: val
.unbind();

Self::Ok(Py::new(py, OkWrapper { value: val })?)
}
Err(val) => {
let val = val
.into_pyobject(py)
.map_err(|e| {
let e: PyErr = e.into();
e
})?
.into_any()
.unbind(),
}),
.unbind();

Self::Err(Py::new(py, ErrWrapper { value: val })?)
}
};
Ok(res)
}
Expand Down