diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-04-25 21:06:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-25 21:06:33 +0200 |
| commit | 94dfb3ba78e211ea2a650b7aaeff2b79e0235003 (patch) | |
| tree | d85c6bc6349d55030fff556fdb7b3f4afd4fffe8 /library/core | |
| parent | 8d00a8d11ee0f0c08d1eff0a3fd33ca89ed6a535 (diff) | |
| parent | 57316559e4d6161ee1ac66d1c8db68562bdd0eaa (diff) | |
| download | rust-94dfb3ba78e211ea2a650b7aaeff2b79e0235003.tar.gz rust-94dfb3ba78e211ea2a650b7aaeff2b79e0235003.zip | |
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
Diffstat (limited to 'library/core')
| -rw-r--r-- | library/core/src/slice/sort.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/library/core/src/slice/sort.rs b/library/core/src/slice/sort.rs index 07fd96f9295..e6e3b55efa9 100644 --- a/library/core/src/slice/sort.rs +++ b/library/core/src/slice/sort.rs @@ -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, |