Fix no_global_oom_handling build #110649
Merged
Fix no_global_oom_handling build #110649
Conversation
This file contains 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
`provide_sorted_batch` in core is incorrectly marked with `#[cfg(not(no_global_oom_handling))]` which prevents core from building with the cfg enabled. Nothing in core allocates memory including this function, so the `cfg` gate is incorrect.
rustbot
added
S-waiting-on-review
|
Hey! It looks like you've submitted a new PR for the library teams! If this PR contains changes to any Examples of
|
arlosi
added
the
regression-from-stable-to-stable
rustbot
added
the
I-prioritize
|
@Ericson2314 @ojeda - Looks like the existing test (https://github.com/rust-lang/rust/blob/409661936f929b254ffc8adb644cf35d1f9765c4/tests/run-make/alloc-no-oom-handling/Makefile) only builds |
This was referenced Apr 21, 2023
|
Definitely @dpaoliello, thanks! Sent #110652. |
ojeda
added a commit
to ojeda/rust
that referenced
this pull request
Apr 23, 2023
…m_handling` `tests/run-make/alloc-no-oom-handling` tests that `alloc` under `no_global_oom_handling` builds and is warning-free. Do the same for `core` to prevent issues such as [1]. Link: rust-lang#110649 [1] Signed-off-by: Miguel Ojeda <[email protected]>
|
@bors r+ |
bors
added
S-waiting-on-bors
apiraino
removed
the
I-prioritize
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Apr 25, 2023
… r=Mark-Simulacrum Fix no_global_oom_handling build `provide_sorted_batch` in core is incorrectly marked with `#[cfg(not(no_global_oom_handling))]` which prevents core from building with the cfg enabled. Nothing in `core` allocates memory (including this function). The `cfg` gate is incorrect. cc `@dpaoliello` r? `@wesleywiser` The cfg was added by rust-lang#107191
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 25, 2023
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#110556 (Switch to `EarlyBinder` for `explicit_item_bounds`) - rust-lang#110615 (Add `impl_tag!` macro to implement `Tag` for tagged pointer easily) - rust-lang#110649 (Fix no_global_oom_handling build) - rust-lang#110671 (Consider polarity in new solver) - rust-lang#110783 (Fix ICE on --print=... i/o errors) - rust-lang#110796 (Updating Wake example to use new 'pin!' macro) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Apr 29, 2023
…test, r=Mark-Simulacrum Add test for warning-free builds of `core` under `no_global_oom_handling` `tests/run-make/alloc-no-oom-handling` tests that `alloc` under `no_global_oom_handling` builds and is warning-free. Do the same for `core` to prevent issues such as [1]. Link: rust-lang#110649 [1]
SamZhang3
added a commit
to SamZhang3/doors-rs-old
that referenced
this pull request
Jun 11, 2023
With the current Rust nightly (2023-06-01 as of this writing), using `-Zbuild-std` to recompile the `core` and `alloc` crates while enabling the `no_global_oom_handling` cfg now works properly. Therefore there is no further need for the `doors_alloc` hack, which involved manually copying the source for `alloc` and adding it as a Cargo dependency. It is still not clear what change on the Rust/Cargo end fixed the bug that previously blocked using `-Zbuild-std` to set the cfg (at the time, trying to enable the cfg resulted in large numbers of mysterious "duplicate lang item" errors). Maybe rust-lang/rust#110649 is related.
SamZhang3
added a commit
to SamZhang3/doors-rs-old
that referenced
this pull request
Jun 11, 2023
With the Rust nightly currently used for Doors (2023-06-01 as of this writing), using `-Zbuild-std` to recompile the `core` and `alloc` crates while enabling the `no_global_oom_handling` cfg now works properly. Therefore there is no further need for the `doors_alloc` hack, which involved manually copying the source for `alloc` and adding it as a Cargo dependency. It is still not clear what change on the Rust/Cargo end fixed the bug that previously blocked using `-Zbuild-std` to set the cfg (at the time, trying to enable the cfg resulted in large numbers of mysterious "duplicate lang item" errors). Maybe rust-lang/rust#110649 is related.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
provide_sorted_batchin core is incorrectly marked with#[cfg(not(no_global_oom_handling))]which prevents core from building with the cfg enabled.Nothing in
coreallocates memory (including this function). Thecfggate is incorrect.cc @dpaoliello
r? @wesleywiser
The cfg was added by #107191