Fix alloc_error_handler signature mismatch
#150757
Merged
+3
−2
Conversation
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
rustbot
added
S-waiting-on-review
Collaborator
|
r? @nnethercote rustbot has assigned @nnethercote. Use |
Contributor
Author
|
r? @bjorn3 |
Member
|
@bors r+ |
rust-bors
bot
added
the
S-waiting-on-bors
Collaborator
Collaborator
|
🌲 The tree is currently closed for pull requests below priority 1000. This pull request will be tested once the tree is reopened. |
rust-bors
bot
removed
the
S-waiting-on-review
Contributor
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jan 8, 2026
Fix `alloc_error_handler` signature mismatch Commit rust-lang#147526 removed the following code and replaced it with the `AllocatorMethod`. However, its input is empty, resulting in behavior inconsistent with the previous code. ```rust create_wrapper_function( tcx, &cx, &mangle_internal_symbol(tcx, "__rust_alloc_error_handler"), Some(&mangle_internal_symbol(tcx, alloc_error_handler_name(alloc_error_handler_kind))), &[usize, usize], // size, align None, true, &CodegenFnAttrs::new(), ); ``` resolves rust-lang#150755
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jan 8, 2026
Fix `alloc_error_handler` signature mismatch fixes rust-lang#98342 r? @GuillaumeGomez Renders intra-doc links in the note text of the `#[deprecated]` attribute. It is quite natural to suggest some other function to use there. So e.g. ```rust #[deprecated(since = "0.0.0", note = "use [`std::mem::size_of`] instead")] ``` renders as <img width="431" height="74" alt="Screenshot from 2026-01-06 12-08-21" src="https://github.com/user-attachments/assets/8f608f08-13ee-4bbf-a631-6008058a51e2" />
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jan 8, 2026
Fix `alloc_error_handler` signature mismatch Commit rust-lang#147526 removed the following code and replaced it with the `AllocatorMethod`. However, its input is empty, resulting in behavior inconsistent with the previous code. ```rust create_wrapper_function( tcx, &cx, &mangle_internal_symbol(tcx, "__rust_alloc_error_handler"), Some(&mangle_internal_symbol(tcx, alloc_error_handler_name(alloc_error_handler_kind))), &[usize, usize], // size, align None, true, &CodegenFnAttrs::new(), ); ``` resolves rust-lang#150755
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jan 8, 2026
Fix `alloc_error_handler` signature mismatch It was added in ddee45e ([here](https://github.com/rust-lang/rust/pull/97802/changes#diff-85dc642a7bdad363a9e37d2491230280fcd977391ba7a242bda2da9ddb55f654) to be specific) when SIGPIPE was controlled with an attribute on `fn main()` which meant it could also be combined with `#[rustc_main]`: #[unix_sigpipe = "sig_dfl"] #[rustc_main] fn rustc_main() { The test stopped being needed in cde0cde when `#[unix_sigpipe = "..."]` was replaced by `-Zon-broken-pipe=...`. And it will not be needed when `-Zon-broken-pipe=...` is replaced by an Externally Implementable Item (see rust-lang#150591). Let's remove this test. Tracking issue: - rust-lang#150588
rust-bors bot
added a commit
that referenced
this pull request
Jan 8, 2026
Rollup of 6 pull requests Successful merges: - #150675 (MGCA: Support tuple expressions as direct const arguments) - #150696 (enrich error info when tries to dlopen Enzyme) - #150747 (tests/ui/runtime/on-broken-pipe/with-rustc_main.rs: Not needed so remove) - #150757 (Fix `alloc_error_handler` signature mismatch) - #150777 (Stabilize `slice::element_offset`) - #150791 (Remove out of date FIXME comment.) r? @ghost
rust-timer
added a commit
that referenced
this pull request
Jan 8, 2026
Rollup merge of #150757 - rm-unneded-test, r=bjorn3 Fix `alloc_error_handler` signature mismatch It was added in ddee45e ([here](https://github.com/rust-lang/rust/pull/97802/changes#diff-85dc642a7bdad363a9e37d2491230280fcd977391ba7a242bda2da9ddb55f654) to be specific) when SIGPIPE was controlled with an attribute on `fn main()` which meant it could also be combined with `#[rustc_main]`: #[unix_sigpipe = "sig_dfl"] #[rustc_main] fn rustc_main() { The test stopped being needed in cde0cde when `#[unix_sigpipe = "..."]` was replaced by `-Zon-broken-pipe=...`. And it will not be needed when `-Zon-broken-pipe=...` is replaced by an Externally Implementable Item (see #150591). Let's remove this test. Tracking issue: - #150588
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
Commit #147526 removed the following code and replaced it with the
AllocatorMethod. However, its input is empty, resulting in behavior inconsistent with the previous code.resolves #150755