Skip to content

Commit 94dfb3b

Browse files
authored
Rollup merge of #110649 - arlosi:fix_no_global_oom_handling, 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 #107191
2 parents 8d00a8d + 5731655 commit 94dfb3b

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

library/core/src/slice/sort.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1456,7 +1456,6 @@ pub struct TimSortRun {
14561456

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

0 commit comments

Comments
 (0)