rust: handle panics to show meaningful error #1336
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Beerosagos
force-pushed
the
handle-panics
branch
from
c912152 to
2f60114
Compare
benma
requested changes
Dec 6, 2024
Beerosagos
force-pushed
the
handle-panics
branch
2 times, most recently
from
7b5e826 to
cbf9051
Compare
|
Updated! PTAL 🙏 |
benma
reviewed
Dec 12, 2024
| /// displays the input error message on the screen and enters | ||
| /// an infinite loop. | ||
| #[allow(clippy::empty_loop)] | ||
| pub fn abort(err: &str) { |
There was a problem hiding this comment.
I think here -> ! would fit as a return type? Right @NickeZ?
There was a problem hiding this comment.
Yes, if you make it return !, you can probably remove the clippy lint exception.
There was a problem hiding this comment.
Done, but clippy still complaints
src/rust/bitbox02/src/ui/ui.rs
Outdated
Comment on lines
425
to
430
| pub fn with_lock_animation<F: Fn()>(f: F) { | ||
| pub fn lock_animation_start() { | ||
| unsafe { bitbox02_sys::lock_animation_start() }; | ||
| f(); | ||
| } | ||
|
|
||
| pub fn lock_animation_stop() { | ||
| unsafe { bitbox02_sys::lock_animation_stop() }; | ||
| } |
There was a problem hiding this comment.
This is fine, but if you wanted to keep the with_lock_animation() wrapper, you could have the callback function return the error and do
unsafe { bitbox02::ui::lock_animation_start(); }
let result = f();
unsafe { bitbox02::ui::lock_animation_stop(); }
result
There was a problem hiding this comment.
I tried it in the beginning, but it wasn't working well as I was handling the error inside f(), and the error message was overlapped by the unlock animation. Now it should work properly 👍
Beerosagos
force-pushed
the
handle-panics
branch
from
cbf9051 to
1908efd
Compare
In b09c333 we added the `panic_immediate_abort` to the rust cargo flags. This caused all the panics previously handled by the handler defined in lib.rs to just show the `hard fault` error message on the screen of the bitbox. This adds the manual handling of some of those panics, to provide useful debug messages.
Beerosagos
force-pushed
the
handle-panics
branch
from
1908efd to
7265e60
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In b09c333 we added the
panic_immediate_abortto the rust cargo flags. This caused all the panics previously handled by the handler defined in lib.rs to just show thehard faulterror message on the screen of the bitbox.This adds the manual handling of some of those panics, to provide useful debug messages.