arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-23 14:58:09 +00:00
Code Issues Releases Wiki Activity

refactor(core/rust): do not rely too much on new_exception helpers

Browse Source
This commit is contained in:
matejcik 2021-09-17 15:10:48 +02:00 committed by Martin Milata
parent 5e452dc57c
commit 7a17124b43
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/embed/rust/build.rs
View File

@ -97,8 +97,6 @@ fn generate_micropython_bindings() {
// exceptions // exceptions
.allowlist_function("nlr_jump") .allowlist_function("nlr_jump")
.allowlist_function("mp_obj_new_exception") .allowlist_function("mp_obj_new_exception")
.allowlist_function("mp_obj_new_exception_msg")
.allowlist_function("mp_obj_new_exception_arg1")
.allowlist_function("mp_obj_new_exception_args") .allowlist_function("mp_obj_new_exception_args")
.allowlist_function("trezor_obj_call_protected") .allowlist_function("trezor_obj_call_protected")
.allowlist_var("mp_type_AttributeError") .allowlist_var("mp_type_AttributeError")

10
core/embed/rust/src/error.rs
View File

@ -34,10 +34,14 @@ impl Error {
Error::AllocationFailed => ffi::mp_obj_new_exception(&ffi::mp_type_MemoryError), Error::AllocationFailed => ffi::mp_obj_new_exception(&ffi::mp_type_MemoryError),
Error::CaughtException(obj) => obj, Error::CaughtException(obj) => obj,
Error::KeyError(key) => { Error::KeyError(key) => {
ffi::mp_obj_new_exception_arg1(&ffi::mp_type_KeyError, key.into()) ffi::mp_obj_new_exception_args(&ffi::mp_type_KeyError, 1, &key.into())
} }
Error::ValueError(msg) => { Error::ValueError(msg) => {
ffi::mp_obj_new_exception_msg(&ffi::mp_type_ValueError, msg.as_ptr()) if let Ok(msg) = msg.try_into() {
ffi::mp_obj_new_exception_args(&ffi::mp_type_ValueError, 1, &msg)
} else {
ffi::mp_obj_new_exception(&ffi::mp_type_ValueError)
}
} }
Error::ValueErrorParam(msg, param) => { Error::ValueErrorParam(msg, param) => {
if let Ok(msg) = msg.try_into() { if let Ok(msg) = msg.try_into() {
@ -48,7 +52,7 @@ impl Error {
} }
} }
Error::AttributeError(attr) => { Error::AttributeError(attr) => {
ffi::mp_obj_new_exception_arg1(&ffi::mp_type_AttributeError, attr.into()) ffi::mp_obj_new_exception_args(&ffi::mp_type_AttributeError, 1, &attr.into())
} }
} }
} }