dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Try to golf down the amount of code in Layout

This commit is contained in:
Ben Kimock 2024-08-20 18:41:07 -04:00
parent 7f5d282185
commit e6b0f27e00
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
library/core/src/alloc/layout.rs
View File

@ -68,19 +68,14 @@ impl Layout {
pub const fn from_size_align(size: usize, align: usize) -> Result<Self, LayoutError> { pub const fn from_size_align(size: usize, align: usize) -> Result<Self, LayoutError> {
if Layout::is_size_align_valid(size, align) { if Layout::is_size_align_valid(size, align) {
// SAFETY: Layout::is_size_align_valid checks the preconditions for this call. // SAFETY: Layout::is_size_align_valid checks the preconditions for this call.
let layout = unsafe { Layout::from_size_align_unchecked(size, align) }; unsafe { Ok(Layout { size, align: mem::transmute(align) }) }
Ok(layout)
} else { } else {
Err(LayoutError) Err(LayoutError)
} }
} }
const fn is_size_align_valid(size: usize, align: usize) -> bool { const fn is_size_align_valid(size: usize, align: usize) -> bool {
if !align.is_power_of_two() { let Some(align) = Alignment::new(align) else { return false };
return false;
}
// SAFETY: Precondition checked directly above.
let align = unsafe { Alignment::new_unchecked(align) };
if size > Self::max_size_for_align(align) { if size > Self::max_size_for_align(align) {
return false; return false;
} }
@ -139,7 +134,7 @@ impl Layout {
) => Layout::is_size_align_valid(size, align) ) => Layout::is_size_align_valid(size, align)
); );
// SAFETY: the caller is required to uphold the preconditions. // SAFETY: the caller is required to uphold the preconditions.
unsafe { Layout { size, align: Alignment::new_unchecked(align) } } unsafe { Layout { size, align: mem::transmute(align) } }
} }
/// The minimum size in bytes for a memory block of this layout. /// The minimum size in bytes for a memory block of this layout.