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

Make ptr::from_ref and ptr::from_mut in rust-lang#106116 const. As per rust-lang#106116 (comment)
matthiaskrgr · Mar 10, 2023 · 65db3cb · 65db3cb
2 parents e0c8ba1 + e8fbf62
commit 65db3cb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/library/core/src/ptr/mod.rs b/library/core/src/ptr/mod.rs
@@ -691,7 +691,7 @@ where
 #[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
 }