From 8fdeaf34aa5f3544a2c7211187781c9386f214dd Mon Sep 17 00:00:00 2001
From: Josh Stone <cuviper@gmail.com>
Date: Tue, 12 Aug 2025 15:12:49 -0700
Subject: [PATCH] Use `size_of`/`size_of_val` from the prelude

---
 rayon-demo/src/sort.rs |  9 ++++-----
 src/iter/mod.rs        |  6 ++----
 src/slice/mod.rs       |  9 ++++-----
 src/slice/sort.rs      | 10 +++++-----
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/rayon-demo/src/sort.rs b/rayon-demo/src/sort.rs
index dccb29e9d..e67cb274c 100644
--- a/rayon-demo/src/sort.rs
+++ b/rayon-demo/src/sort.rs
@@ -1,7 +1,6 @@
 use rand::distr::{Alphanumeric, StandardUniform, Uniform};
 use rand::Rng;
 use rayon::prelude::*;
-use std::mem;
 use std::sync::atomic::AtomicUsize;
 use std::sync::atomic::Ordering::SeqCst;
 use test::{black_box, Bencher};
@@ -74,7 +73,7 @@ macro_rules! sort {
         fn $name(b: &mut Bencher) {
             let v = $gen($len);
             b.iter(|| v.clone().$f());
-            b.bytes = $len * mem::size_of_val(&$gen(1)[0]) as u64;
+            b.bytes = $len * size_of_val(&$gen(1)[0]) as u64;
         }
     };
 }
@@ -85,7 +84,7 @@ macro_rules! sort_keys {
         fn $name(b: &mut Bencher) {
             let v = $gen($len);
             b.iter(|| v.clone().$f(ToString::to_string));
-            b.bytes = $len * mem::size_of_val(&$gen(1)[0]) as u64;
+            b.bytes = $len * size_of_val(&$gen(1)[0]) as u64;
         }
     };
 }
@@ -97,7 +96,7 @@ macro_rules! sort_strings {
             let v = $gen($len);
             let v = v.iter().map(|s| &**s).collect::<Vec<&str>>();
             b.iter(|| v.clone().$f());
-            b.bytes = $len * mem::size_of::<&str>() as u64;
+            b.bytes = $len * size_of::<&str>() as u64;
         }
     };
 }
@@ -124,7 +123,7 @@ macro_rules! sort_expensive {
 
                 black_box(count);
             });
-            b.bytes = $len * mem::size_of_val(&$gen(1)[0]) as u64;
+            b.bytes = $len * size_of_val(&$gen(1)[0]) as u64;
         }
     };
 }
diff --git a/src/iter/mod.rs b/src/iter/mod.rs
index a08a61f28..9c6d47ccd 100644
--- a/src/iter/mod.rs
+++ b/src/iter/mod.rs
@@ -3258,7 +3258,6 @@ pub trait IndexedParallelIterator: ParallelIterator {
 ///
 /// ```
 /// use rayon::prelude::*;
-/// use std::mem;
 ///
 /// struct BlackHole {
 ///     mass: usize,
@@ -3270,7 +3269,7 @@ pub trait IndexedParallelIterator: ParallelIterator {
 ///     {
 ///         let par_iter = par_iter.into_par_iter();
 ///         BlackHole {
-///             mass: par_iter.count() * mem::size_of::<T>(),
+///             mass: par_iter.count() * size_of::<T>(),
 ///         }
 ///     }
 /// }
@@ -3311,7 +3310,6 @@ where
 ///
 /// ```
 /// use rayon::prelude::*;
-/// use std::mem;
 ///
 /// struct BlackHole {
 ///     mass: usize,
@@ -3322,7 +3320,7 @@ where
 ///         where I: IntoParallelIterator<Item = T>
 ///     {
 ///         let par_iter = par_iter.into_par_iter();
-///         self.mass += par_iter.count() * mem::size_of::<T>();
+///         self.mass += par_iter.count() * size_of::<T>();
 ///     }
 /// }
 ///
diff --git a/src/slice/mod.rs b/src/slice/mod.rs
index 590262769..506aaedc8 100644
--- a/src/slice/mod.rs
+++ b/src/slice/mod.rs
@@ -20,7 +20,6 @@ use crate::split_producer::*;
 
 use std::cmp::Ordering;
 use std::fmt::{self, Debug};
-use std::mem;
 
 pub use self::chunk_by::{ChunkBy, ChunkByMut};
 pub use self::chunks::{Chunks, ChunksExact, ChunksExactMut, ChunksMut};
@@ -567,10 +566,10 @@ pub trait ParallelSliceMut<T: Send> {
             }};
         }
 
-        let sz_u8 = mem::size_of::<(K, u8)>();
-        let sz_u16 = mem::size_of::<(K, u16)>();
-        let sz_u32 = mem::size_of::<(K, u32)>();
-        let sz_usize = mem::size_of::<(K, usize)>();
+        let sz_u8 = size_of::<(K, u8)>();
+        let sz_u16 = size_of::<(K, u16)>();
+        let sz_u32 = size_of::<(K, u32)>();
+        let sz_usize = size_of::<(K, usize)>();
 
         if sz_u8 < sz_u16 && len <= (u8::MAX as usize) {
             return sort_by_key!(u8);
diff --git a/src/slice/sort.rs b/src/slice/sort.rs
index 4d14d9b6c..ff3a3fde3 100644
--- a/src/slice/sort.rs
+++ b/src/slice/sort.rs
@@ -354,10 +354,10 @@ where
 
     // Returns the number of elements between pointers `l` (inclusive) and `r` (exclusive).
     fn width<T>(l: *mut T, r: *mut T) -> usize {
-        assert!(mem::size_of::<T>() > 0);
+        assert!(size_of::<T>() > 0);
         // FIXME: this should *likely* use `offset_from`, but more
         // investigation is needed (including running tests in miri).
-        (r as usize - l as usize) / mem::size_of::<T>()
+        (r as usize - l as usize) / size_of::<T>()
     }
 
     loop {
@@ -936,7 +936,7 @@ where
     F: Fn(&T, &T) -> bool + Sync,
 {
     // Sorting has no meaningful behavior on zero-sized types.
-    if mem::size_of::<T>() == 0 {
+    if size_of::<T>() == 0 {
         return;
     }
 
@@ -1102,7 +1102,7 @@ where
     CmpF: Fn(&T, &T) -> bool,
 {
     // The caller should have already checked that.
-    debug_assert_ne!(mem::size_of::<T>(), 0);
+    debug_assert_ne!(size_of::<T>(), 0);
 
     let len = v.len();
 
@@ -1521,7 +1521,7 @@ where
     const CHUNK_LENGTH: usize = 2000;
 
     // Sorting has no meaningful behavior on zero-sized types.
-    if mem::size_of::<T>() == 0 {
+    if size_of::<T>() == 0 {
         return;
     }