arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-02-22 20:42:03 +00:00
Code Issues Releases Wiki Activity

rust: use ? instead of unwrap() in tt/layout.rs

Browse Source
This commit is contained in:
grdddj 2023-03-30 19:31:10 +02:00
parent 9abecbdd9b
commit 294bdb6021
1 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
core/embed/rust/src/ui/model_tt/layout.rs
View File

@ -1359,23 +1359,11 @@ extern "C" fn new_show_checklist(n_args: usize, args: *const Obj, kwargs: *mut M
extern "C" fn new_confirm_recovery(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj { extern "C" fn new_confirm_recovery(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
let block = move |_args: &[Obj], kwargs: &Map| { let block = move |_args: &[Obj], kwargs: &Map| {
let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title).unwrap().try_into().unwrap(); let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
let description: StrBuffer = kwargs let description: StrBuffer = kwargs.get(Qstr::MP_QSTR_description)?.try_into()?;
.get(Qstr::MP_QSTR_description) let button: StrBuffer = kwargs.get(Qstr::MP_QSTR_button)?.try_into()?;
.unwrap() let dry_run: bool = kwargs.get(Qstr::MP_QSTR_dry_run)?.try_into()?;
.try_into() let info_button: bool = kwargs.get_or(Qstr::MP_QSTR_info_button, false)?;
.unwrap();
let button: StrBuffer = kwargs
.get(Qstr::MP_QSTR_button)
.unwrap()
.try_into()
.unwrap();
let dry_run: bool = kwargs
.get(Qstr::MP_QSTR_dry_run)
.unwrap()
.try_into()
.unwrap();
let info_button: bool = kwargs.get_or(Qstr::MP_QSTR_info_button, false).unwrap();
let paragraphs = Paragraphs::new([ let paragraphs = Paragraphs::new([
Paragraph::new(&theme::TEXT_DEMIBOLD, title).centered(), Paragraph::new(&theme::TEXT_DEMIBOLD, title).centered(),
@ -1410,11 +1398,7 @@ extern "C" fn new_confirm_recovery(n_args: usize, args: *const Obj, kwargs: *mut
extern "C" fn new_select_word_count(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj { extern "C" fn new_select_word_count(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
let block = move |_args: &[Obj], kwargs: &Map| { let block = move |_args: &[Obj], kwargs: &Map| {
let dry_run: bool = kwargs let dry_run: bool = kwargs.get(Qstr::MP_QSTR_dry_run)?.try_into()?;
.get(Qstr::MP_QSTR_dry_run)
.unwrap()
.try_into()
.unwrap();
let title = if dry_run { let title = if dry_run {
"SEED CHECK" "SEED CHECK"
} else { } else {