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.

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

Rename AllocErr to AllocError #77315

Merged
merged 1 commit into from
Oct 1, 2020
Merged

Conversation

exrook
Copy link
Contributor

@exrook exrook commented Sep 28, 2020

@rust-highfive
Copy link
Collaborator

r? @joshtriplett

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 28, 2020
@joshtriplett
Copy link
Member

Looks good to me. This isn't public, so it can change. And since it's implementing what appears to be the consensus in rust-lang/wg-allocators#57 , I'll go ahead and merge it.

@joshtriplett
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Sep 29, 2020

📌 Commit 5829560 has been approved by joshtriplett

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 29, 2020
@jyn514 jyn514 added A-allocators Area: Custom and system allocators T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. requires-nightly This issue requires a nightly compiler in some way. labels Sep 29, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Sep 30, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 1, 2020
Rollup of 12 pull requests

Successful merges:

 - rust-lang#76909 (Add Iterator::advance_by and DoubleEndedIterator::advance_back_by)
 - rust-lang#77153 (Fix recursive nonterminal expansion during pretty-print/reparse check)
 - rust-lang#77202 (Defer Apple SDKROOT detection to link time.)
 - rust-lang#77303 (const evaluatable: improve `TooGeneric` handling)
 - rust-lang#77305 (move candidate_from_obligation_no_cache)
 - rust-lang#77315 (Rename AllocErr to AllocError)
 - rust-lang#77319 (Stable hashing: add comments and tests concerning platform-independence)
 - rust-lang#77324 (Don't fire `const_item_mutation` lint on writes through a pointer)
 - rust-lang#77343 (Validate `rustc_args_required_const`)
 - rust-lang#77349 (Update cargo)
 - rust-lang#77360 (References to ZSTs may be at arbitrary aligned addresses)
 - rust-lang#77371 (Remove trailing space in error message)

Failed merges:

r? `@ghost`
@bors bors merged commit 70740b1 into rust-lang:master Oct 1, 2020
@rustbot rustbot added this to the 1.48.0 milestone Oct 1, 2020
dvdhrm added a commit to r-efi/r-efi-alloc that referenced this pull request Oct 2, 2020
Synchronize with recent nightly changes. For upstream commits, see:

    rust-lang/rust#77315

Signed-off-by: David Rheinsberg <[email protected]>
parasyte pushed a commit to parasyte/allocator-suite that referenced this pull request Oct 21, 2020
KronicDeth added a commit to GetFirefly/firefly that referenced this pull request Jan 29, 2021
KronicDeth added a commit to GetFirefly/firefly that referenced this pull request Jan 29, 2021
KronicDeth added a commit to GetFirefly/firefly that referenced this pull request Feb 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-allocators Area: Custom and system allocators requires-nightly This issue requires a nightly compiler in some way. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants