arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-08 22:40:59 +00:00
Code Issues Releases Wiki Activity

refactor(core/rust): simplify TryFrom<FlowMsg>

Browse Source
This commit is contained in:
matejcik 2024-09-11 11:25:22 +02:00 committed by matejcik
parent a159ea133a
commit 9431f2a77d
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/embed/rust/src/ui/component/base.rs
View File

@ -610,18 +610,14 @@ impl TryFrom<FlowMsg> for crate::micropython::obj::Obj {
type Error = crate::error::Error;
fn try_from(val: FlowMsg) -> Result<crate::micropython::obj::Obj, Self::Error> {
use crate::ui::layout::result;
match val {
FlowMsg::Confirmed => Ok(crate::ui::layout::result::CONFIRMED.as_obj()),
FlowMsg::Cancelled => Ok(crate::ui::layout::result::CANCELLED.as_obj()),
FlowMsg::Info => Ok(crate::ui::layout::result::INFO.as_obj()),
FlowMsg::Choice(i) => {
Ok((crate::ui::layout::result::CONFIRMED.as_obj(), i.try_into()?).try_into()?)
}
FlowMsg::Text(s) => Ok((
crate::ui::layout::result::CONFIRMED.as_obj(),
s.as_str().try_into()?,
)
.try_into()?),
FlowMsg::Confirmed => Ok(result::CONFIRMED.as_obj()),
FlowMsg::Cancelled => Ok(result::CANCELLED.as_obj()),
FlowMsg::Info => Ok(result::INFO.as_obj()),
FlowMsg::Choice(i) => (result::CONFIRMED.as_obj(), i.try_into()?).try_into(),
FlowMsg::Text(s) => (result::CONFIRMED.as_obj(), s.as_str().try_into()?).try_into(),
}
}
}