Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove obsolete oom handler from sys::redox #43203

Merged
merged 2 commits into from
Jul 14, 2017
Merged

Remove obsolete oom handler from sys::redox #43203

merged 2 commits into from
Jul 14, 2017

Conversation

jackpot51
Copy link
Contributor

Alloc no longer has set_oom_handler.

@rust-highfive
Copy link
Collaborator

r? @sfackler

(rust_highfive has picked a reviewer for you, use r? to override)

@jackpot51
Copy link
Contributor Author

r? @alexcrichton this is related to #43202 and #43204

@jackpot51
Copy link
Contributor Author

^^ Had to fix the tidy check ^^

@alexcrichton
Copy link
Member

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Jul 13, 2017

📌 Commit 21f2ace has been approved by alexcrichton

@jackpot51
Copy link
Contributor Author

Thanks!

@alexcrichton alexcrichton added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 13, 2017
steveklabnik added a commit to steveklabnik/rust that referenced this pull request Jul 13, 2017
@steveklabnik
Rollup merge of rust-lang#43203 - jackpot51:patch-2, r=alexcrichton
9d4b462 
Remove obsolete oom handler from sys::redox

Alloc no longer has set_oom_handler.
@steveklabnik steveklabnik mentioned this pull request Jul 13, 2017
Merged
bors added a commit that referenced this pull request Jul 14, 2017
@bors
Auto merge of #43216 - steveklabnik:rollup, r=steveklabnik
ab91c70 
Rollup of 7 pull requests

- Successful merges: #42926, #43125, #43157, #43167, #43187, #43203, #43204
- Failed merges:
@bors bors merged commit 21f2ace into rust-lang:master Jul 14, 2017
@jonas-schievink jonas-schievink mentioned this pull request Jul 23, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jackpot51 @rust-highfive @alexcrichton @bors @sfackler