Rollup merge of #108956 - Raekye:master, r=scottmcm

Make ptr::from_ref and ptr::from_mut in #106116 const.

As per https://github.com/rust-lang/rust/issues/106116#issuecomment-1462571833
This commit is contained in:
Matthias Krüger 2023-03-10 12:32:01 +01:00 committed by GitHub
commit 65db3cb794
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -691,7 +691,7 @@ pub fn from_exposed_addr_mut<T>(addr: usize) -> *mut T
#[inline(always)]
#[must_use]
#[unstable(feature = "ptr_from_ref", issue = "106116")]
pub fn from_ref<T: ?Sized>(r: &T) -> *const T {
pub const fn from_ref<T: ?Sized>(r: &T) -> *const T {
r
}
@ -702,7 +702,7 @@ pub fn from_ref<T: ?Sized>(r: &T) -> *const T {
#[inline(always)]
#[must_use]
#[unstable(feature = "ptr_from_ref", issue = "106116")]
pub fn from_mut<T: ?Sized>(r: &mut T) -> *mut T {
pub const fn from_mut<T: ?Sized>(r: &mut T) -> *mut T {
r
}