diff options
| author | bors <bors@rust-lang.org> | 2025-03-07 13:47:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-03-07 13:47:27 +0000 |
| commit | 03eb45452305f2d52348279d0caa5fc1f12c438d (patch) | |
| tree | 74910a87bd9be174a8e61365a82c887cb84178e4 /library/alloc/tests/sort | |
| parent | 59a9b9e9d776cb5d6bc02e99c4dce4f94f622232 (diff) | |
| parent | acc7de6c77a9b08aab24d2a240f0e781ce5e5766 (diff) | |
| download | rust-03eb45452305f2d52348279d0caa5fc1f12c438d.tar.gz rust-03eb45452305f2d52348279d0caa5fc1f12c438d.zip | |
Auto merge of #138155 - matthiaskrgr:rollup-xq5buio, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #137674 (Enable `f16` for LoongArch) - #138034 (library: Use `size_of` from the prelude instead of imported) - #138060 (Revert #138019 after further discussion about how hir-pretty printing should work) - #138073 (Break critical edges in inline asm before code generation) - #138107 (`librustdoc`: clippy fixes) - #138111 (Use `default_field_values` for `rustc_errors::Context`, `rustc_session::config::NextSolverConfig` and `rustc_session::config::ErrorOutputType`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/alloc/tests/sort')
| -rw-r--r-- | library/alloc/tests/sort/known_good_stable_sort.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/library/alloc/tests/sort/known_good_stable_sort.rs b/library/alloc/tests/sort/known_good_stable_sort.rs index f8615435fc2..2df89146253 100644 --- a/library/alloc/tests/sort/known_good_stable_sort.rs +++ b/library/alloc/tests/sort/known_good_stable_sort.rs @@ -5,7 +5,7 @@ // Based on https://github.com/voultapher/tiny-sort-rs. use alloc::alloc::{Layout, alloc, dealloc}; -use std::{mem, ptr}; +use std::ptr; /// Sort `v` preserving initial order of equal elements. /// @@ -26,7 +26,7 @@ pub fn sort<T: Ord>(v: &mut [T]) { #[inline(always)] fn stable_sort<T, F: FnMut(&T, &T) -> bool>(v: &mut [T], mut is_less: F) { - if mem::size_of::<T>() == 0 { + if size_of::<T>() == 0 { return; } @@ -166,7 +166,7 @@ struct BufGuard<T> { impl<T> BufGuard<T> { // SAFETY: The caller has to ensure that len is not 0 and that T is not a ZST. unsafe fn new(len: usize) -> Self { - debug_assert!(len > 0 && mem::size_of::<T>() > 0); + debug_assert!(len > 0 && size_of::<T>() > 0); // SAFETY: See function safety description. let layout = unsafe { unwrap_unchecked(Layout::array::<T>(len).ok()) }; |
