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

Fix missing no_global_oom_handling cfg-gating #89036

Merged
merged 1 commit into from
Sep 22, 2021
Merged

Conversation

nbdd0121
Copy link
Contributor

Cfg-gate these trait impls that are neglected.

These functions compile now because they use box syntax which depends on exchange_malloc during codegen only; as a result they compiles with cfg no_global_oom_handling but shouldn't.

Discovered in #89030 because that PR makes box syntax depend on exchange_malloc lang item during MIR construction.

@rust-highfive
Copy link
Collaborator

r? @yaahc

(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 17, 2021
@yaahc yaahc added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Sep 20, 2021
@yaahc
Copy link
Member

yaahc commented Sep 20, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Sep 20, 2021

📌 Commit be5a5b7 has been approved by yaahc

@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 20, 2021
the8472 added a commit to the8472/rust that referenced this pull request Sep 22, 2021
Fix missing `no_global_oom_handling` cfg-gating

Cfg-gate these trait impls that are neglected.

These functions compile now because they use `box` syntax which depends on `exchange_malloc` during codegen only; as a result they compiles with cfg `no_global_oom_handling` but shouldn't.

Discovered in rust-lang#89030 because that PR makes `box` syntax depend on `exchange_malloc` lang item during MIR construction.
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 22, 2021
Rollup of 8 pull requests

Successful merges:

 - rust-lang#89036 (Fix missing `no_global_oom_handling` cfg-gating)
 - rust-lang#89041 (Work around invalid DWARF bugs for fat LTO)
 - rust-lang#89046 ("Fix" an overflow in byte position math)
 - rust-lang#89127 (Re-enable the `src/test/debuginfo/mutex.rs` test on Windows)
 - rust-lang#89133 (Fix ICE with `--cap-lints=allow` and `-Zfuel=...=0`)
 - rust-lang#89162 (rustc_index: Add some map-like APIs to `IndexVec`)
 - rust-lang#89164 (Document `--show-type-layout` in the rustdoc book)
 - rust-lang#89170 (Disable the leak sanitizer on Macos aarch64 for now)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0063551 into rust-lang:master Sep 22, 2021
@rustbot rustbot added this to the 1.57.0 milestone Sep 22, 2021
@nbdd0121 nbdd0121 deleted the alloc branch September 22, 2021 22:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants