compiler: Use size_of from the prelude instead of imported
Use `std::mem::{size_of, size_of_val, align_of, align_of_val}` from the prelude instead of importing or qualifying them. These functions were added to all preludes in Rust 1.80.
This commit is contained in:
parent
ac951d3799
commit
38fad984c6
30 changed files with 64 additions and 74 deletions
|
@ -2,10 +2,8 @@ use std::ptr::Alignment;
|
|||
|
||||
/// Returns the ABI-required minimum alignment of a type in bytes.
|
||||
///
|
||||
/// This is equivalent to [`mem::align_of`], but also works for some unsized
|
||||
/// This is equivalent to [`align_of`], but also works for some unsized
|
||||
/// types (e.g. slices or rustc's `List`s).
|
||||
///
|
||||
/// [`mem::align_of`]: std::mem::align_of
|
||||
pub const fn align_of<T: ?Sized + Aligned>() -> Alignment {
|
||||
T::ALIGN
|
||||
}
|
||||
|
@ -15,10 +13,10 @@ pub const fn align_of<T: ?Sized + Aligned>() -> Alignment {
|
|||
/// # Safety
|
||||
///
|
||||
/// `Self::ALIGN` must be equal to the alignment of `Self`. For sized types it
|
||||
/// is [`mem::align_of<Self>()`], for unsized types it depends on the type, for
|
||||
/// is [`align_of::<Self>()`], for unsized types it depends on the type, for
|
||||
/// example `[T]` has alignment of `T`.
|
||||
///
|
||||
/// [`mem::align_of<Self>()`]: std::mem::align_of
|
||||
/// [`align_of::<Self>()`]: align_of
|
||||
pub unsafe trait Aligned {
|
||||
/// Alignment of `Self`.
|
||||
const ALIGN: Alignment;
|
||||
|
|
|
@ -863,15 +863,13 @@ fn get_thread_id() -> u32 {
|
|||
cfg_match! {
|
||||
windows => {
|
||||
pub fn get_resident_set_size() -> Option<usize> {
|
||||
use std::mem;
|
||||
|
||||
use windows::{
|
||||
Win32::System::ProcessStatus::{K32GetProcessMemoryInfo, PROCESS_MEMORY_COUNTERS},
|
||||
Win32::System::Threading::GetCurrentProcess,
|
||||
};
|
||||
|
||||
let mut pmc = PROCESS_MEMORY_COUNTERS::default();
|
||||
let pmc_size = mem::size_of_val(&pmc);
|
||||
let pmc_size = size_of_val(&pmc);
|
||||
unsafe {
|
||||
K32GetProcessMemoryInfo(
|
||||
GetCurrentProcess(),
|
||||
|
@ -889,7 +887,7 @@ cfg_match! {
|
|||
pub fn get_resident_set_size() -> Option<usize> {
|
||||
use libc::{c_int, c_void, getpid, proc_pidinfo, proc_taskinfo, PROC_PIDTASKINFO};
|
||||
use std::mem;
|
||||
const PROC_TASKINFO_SIZE: c_int = mem::size_of::<proc_taskinfo>() as c_int;
|
||||
const PROC_TASKINFO_SIZE: c_int = size_of::<proc_taskinfo>() as c_int;
|
||||
|
||||
unsafe {
|
||||
let mut info: proc_taskinfo = mem::zeroed();
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
use std::borrow::Borrow;
|
||||
use std::collections::hash_map::RawEntryMut;
|
||||
use std::hash::{Hash, Hasher};
|
||||
use std::{iter, mem};
|
||||
use std::iter;
|
||||
|
||||
use either::Either;
|
||||
|
||||
|
@ -221,7 +221,7 @@ pub fn make_hash<K: Hash + ?Sized>(val: &K) -> u64 {
|
|||
/// consistently for each `Sharded` instance.
|
||||
#[inline]
|
||||
fn get_shard_hash(hash: u64) -> usize {
|
||||
let hash_len = mem::size_of::<usize>();
|
||||
let hash_len = size_of::<usize>();
|
||||
// Ignore the top 7 bits as hashbrown uses these and get the next SHARD_BITS highest bits.
|
||||
// hashbrown also uses the lowest bits, so we can't use those
|
||||
(hash >> (hash_len * 8 - 7 - SHARD_BITS)) as usize
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue