Skip to content

Commit e47fec5

Browse files
committed
Make Layout::new const
1 parent c404ce6 commit e47fec5

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

src/libcore/alloc.rs

+2-3
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

@@ -121,13 +121,12 @@ impl Layout {
121121
/// Constructs a `Layout` suitable for holding a value of type `T`.
122122
#[stable(feature = "alloc_layout", since = "1.28.0")]
123123
#[inline]
124-
pub fn new<T>() -> Self {
124+
pub const fn new<T>() -> Self {
125125
let (size, align) = size_align::<T>();
126126
// Note that the align is guaranteed by rustc to be a power of two and
127127
// the size+align combo is guaranteed to fit in our address space. As a
128128
// result use the unchecked constructor here to avoid inserting code
129129
// that panics if it isn't optimized well enough.
130-
debug_assert!(Layout::from_size_align(size, align).is_ok());
131130
unsafe { Layout::from_size_align_unchecked(size, align) }
132131
}
133132

0 commit comments

Comments
 (0)