Skip to content

Commit 92bd267

Browse files
authored
Rollup merge of rust-lang#66254 - CAD97:patch-1, r=KodrAus
Make Layout::new const This seems like a reasonable change to make. If we don't provide `Layout::new::<T>` as `const`, then users can just instead do the more error prone `Layout::from_size_align_unchecked(mem::size_of::<T>(), mem::align_of::<T>())` for the same effect and an extra `unsafe { }` incantation.
2 parents c404ce6 + d860def commit 92bd267

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/libcore/alloc.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use crate::usize;
1717
#[derive(Debug)]
1818
pub struct Excess(pub NonNull<u8>, pub usize);
1919

20-
fn size_align<T>() -> (usize, usize) {
20+
const fn size_align<T>() -> (usize, usize) {
2121
(mem::size_of::<T>(), mem::align_of::<T>())
2222
}
2323

@@ -120,14 +120,14 @@ impl Layout {
120120

121121
/// Constructs a `Layout` suitable for holding a value of type `T`.
122122
#[stable(feature = "alloc_layout", since = "1.28.0")]
123+
#[rustc_const_stable(feature = "alloc_layout_const_new", since = "1.42.0")]
123124
#[inline]
124-
pub fn new<T>() -> Self {
125+
pub const fn new<T>() -> Self {
125126
let (size, align) = size_align::<T>();
126127
// Note that the align is guaranteed by rustc to be a power of two and
127128
// the size+align combo is guaranteed to fit in our address space. As a
128129
// result use the unchecked constructor here to avoid inserting code
129130
// that panics if it isn't optimized well enough.
130-
debug_assert!(Layout::from_size_align(size, align).is_ok());
131131
unsafe { Layout::from_size_align_unchecked(size, align) }
132132
}
133133

0 commit comments

Comments
 (0)