Skip to content

directly call handle_alloc_error - #3480

Merged
bors merged 3 commits into
rust-lang:masterfrom
RalfJung:alloc_error_handler
Apr 17, 2024
Merged

directly call handle_alloc_error#3480
bors merged 3 commits into
rust-lang:masterfrom
RalfJung:alloc_error_handler

Conversation

@RalfJung

@RalfJung RalfJung commented Apr 17, 2024

Copy link
Copy Markdown
Member

Also test more codepaths. There's like 5 different things that can happen on allocation failure! Between -Zoom, #[alloc_error_handler], and set_alloc_error_hook, we have 3 layers of behavior overrides. It's all a bit messy.

rust-lang/rust#112331 seems intended to clean this up, but has not yet reached consensus.

@RalfJung

Copy link
Copy Markdown
Member Author

@bors r+

@bors

bors commented Apr 17, 2024

Copy link
Copy Markdown
Contributor

📌 Commit 1f1f613 has been approved by RalfJung

It is now in the queue for this repository.

@bors

bors commented Apr 17, 2024

Copy link
Copy Markdown
Contributor

⌛ Testing commit 1f1f613 with merge dcd17c9...

@bors

bors commented Apr 17, 2024

Copy link
Copy Markdown
Contributor

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing dcd17c9 to master...

@bors
bors merged commit dcd17c9 into rust-lang:master Apr 17, 2024
@RalfJung
RalfJung deleted the alloc_error_handler branch April 17, 2024 10:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants