xous: fix build due to function and feature name changes#150363
Merged
bors merged 2 commits intorust-lang:mainfrom Dec 29, 2025
Merged
xous: fix build due to function and feature name changes#150363bors merged 2 commits intorust-lang:mainfrom
bors merged 2 commits intorust-lang:mainfrom
Conversation
The unwinding feature is called `panic-unwind` and not `panic_unwind`. Adjust the feature gate to look for these values. Additionally, the `abort_internal()` call is no longer used. Signed-off-by: Sean Cross <sean@xobs.io>
This function was incorrectly called run_main_thread_not_inlined when invoked. Signed-off-by: Sean Cross <sean@xobs.io>
rustbot
added
S-waiting-on-review
Collaborator
xobs
changed the title
Contributor
Author
|
This is a version of #149506 but without the |
xobs
changed the title
Member
|
As you're the target maintainer, I'm assuming the change is correct as nothing is obviously incorrect. @bors r+ rollup |
Collaborator
bors
added
S-waiting-on-bors
rust-timer
added a commit
that referenced
this pull request
Dec 29, 2025
Rollup merge of #150363 - betrusted-io:xous-misc-fixes, r=jhpratt xous: fix build due to function and feature name changes This tracks a rename of `panic_unwind` to `panic-unwind`, as well as the removal of `abort_internal` as a function. This also fixes an incorrect function name from when `rust_main_thread_not_inlined` was added.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
This tracks a rename of
panic_unwindtopanic-unwind, as well as the removal ofabort_internalas a function.This also fixes an incorrect function name from when
rust_main_thread_not_inlinedwas added.