Skip to content

Commit

Permalink
Rollup merge of rust-lang#110649 - arlosi:fix_no_global_oom_handling,…
Browse files Browse the repository at this point in the history
… 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
  • Loading branch information
matthiaskrgr authored Apr 25, 2023
2 parents 8d00a8d + 5731655 commit 94dfb3b
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion library/core/src/slice/sort.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1456,7 +1456,6 @@ pub struct TimSortRun {

/// Takes a range as denoted by start and end, that is already sorted and extends it to the right if
/// necessary with sorts optimized for smaller ranges such as insertion sort.
#[cfg(not(no_global_oom_handling))]
fn provide_sorted_batch<T, F>(v: &mut [T], start: usize, mut end: usize, is_less: &mut F) -> usize
where
F: FnMut(&T, &T) -> bool,
Expand Down

0 comments on commit 94dfb3b

Please sign in to comment.