Skip to content

Commit ee21064

Browse files
workingjubileeworkingjubilee
committed
library: Stabilize const_ptr_write
Const-stabilizes: - `write` - `write_bytes` - `write_unaligned` In the following paths: - `core::ptr` - `core::ptr::NonNull` - pointer `<*mut T>` Const-stabilizes the internal `core::intrinsics`: - `write_bytes` - `write_via_move`
1 parent 36ff2c8 commit ee21064

File tree

8 files changed

+12
-15
lines changed

8 files changed

+12
-15
lines changed

‎alloc/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@
173173
#![feature(allow_internal_unstable)]
174174
#![feature(cfg_sanitize)]
175175
#![feature(const_precise_live_drops)]
176-
#![feature(const_ptr_write)]
177176
#![feature(const_try)]
178177
#![feature(decl_macro)]
179178
#![feature(dropck_eyepatch)]

‎alloc/tests/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#![feature(const_cow_is_borrowed)]
88
#![feature(const_heap)]
99
#![cfg_attr(bootstrap, feature(const_mut_refs))]
10-
#![feature(const_ptr_write)]
1110
#![feature(const_try)]
1211
#![feature(core_intrinsics)]
1312
#![feature(extract_if)]

‎core/src/intrinsics.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2635,7 +2635,7 @@ extern "rust-intrinsic" {
26352635
/// This intrinsic can *only* be called where the pointer is a local without
26362636
/// projections (`write_via_move(ptr, x)`, not `write_via_move(*ptr, x)`) so
26372637
/// that it trivially obeys runtime-MIR rules about derefs in operands.
2638-
#[rustc_const_unstable(feature = "const_ptr_write", issue = "86302")]
2638+
#[rustc_const_stable(feature = "const_ptr_write", since = "CURRENT_RUSTC_VERSION")]
26392639
#[rustc_nounwind]
26402640
pub fn write_via_move<T>(ptr: *mut T, value: T);
26412641

@@ -3472,13 +3472,13 @@ pub const unsafe fn copy<T>(src: *const T, dst: *mut T, count: usize) {
34723472
#[doc(alias = "memset")]
34733473
#[stable(feature = "rust1", since = "1.0.0")]
34743474
#[rustc_allowed_through_unstable_modules]
3475-
#[rustc_const_unstable(feature = "const_ptr_write", issue = "86302")]
3475+
#[rustc_const_stable(feature = "const_ptr_write", since = "CURRENT_RUSTC_VERSION")]
34763476
#[inline(always)]
34773477
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
34783478
#[rustc_diagnostic_item = "ptr_write_bytes"]
34793479
pub const unsafe fn write_bytes<T>(dst: *mut T, val: u8, count: usize) {
34803480
extern "rust-intrinsic" {
3481-
#[rustc_const_unstable(feature = "const_ptr_write", issue = "86302")]
3481+
#[rustc_const_stable(feature = "const_ptr_write", since = "CURRENT_RUSTC_VERSION")]
34823482
#[rustc_nounwind]
34833483
fn write_bytes<T>(dst: *mut T, val: u8, count: usize);
34843484
}

‎core/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@
137137
#![feature(const_pointer_is_aligned)]
138138
#![feature(const_ptr_is_null)]
139139
#![feature(const_ptr_sub_ptr)]
140-
#![feature(const_ptr_write)]
141140
#![feature(const_raw_ptr_comparison)]
142141
#![feature(const_replace)]
143142
#![feature(const_size_of_val)]

‎core/src/ptr/mod.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1611,7 +1611,7 @@ pub const unsafe fn read_unaligned<T>(src: *const T) -> T {
16111611
/// ```
16121612
#[inline]
16131613
#[stable(feature = "rust1", since = "1.0.0")]
1614-
#[rustc_const_unstable(feature = "const_ptr_write", issue = "86302")]
1614+
#[rustc_const_stable(feature = "const_ptr_write", since = "CURRENT_RUSTC_VERSION")]
16151615
#[rustc_diagnostic_item = "ptr_write"]
16161616
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
16171617
pub const unsafe fn write<T>(dst: *mut T, src: T) {
@@ -1719,7 +1719,8 @@ pub const unsafe fn write<T>(dst: *mut T, src: T) {
17191719
/// ```
17201720
#[inline]
17211721
#[stable(feature = "ptr_unaligned", since = "1.17.0")]
1722-
#[rustc_const_unstable(feature = "const_ptr_write", issue = "86302")]
1722+
#[cfg_attr(bootstrap, rustc_allow_const_fn_unstable(const_refs_to_cell))]
1723+
#[rustc_const_stable(feature = "const_ptr_write", since = "CURRENT_RUSTC_VERSION")]
17231724
#[rustc_diagnostic_item = "ptr_write_unaligned"]
17241725
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
17251726
pub const unsafe fn write_unaligned<T>(dst: *mut T, src: T) {

‎core/src/ptr/mut_ptr.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1449,7 +1449,7 @@ impl<T: ?Sized> *mut T {
14491449
///
14501450
/// [`ptr::write`]: crate::ptr::write()
14511451
#[stable(feature = "pointer_methods", since = "1.26.0")]
1452-
#[rustc_const_unstable(feature = "const_ptr_write", issue = "86302")]
1452+
#[rustc_const_stable(feature = "const_ptr_write", since = "CURRENT_RUSTC_VERSION")]
14531453
#[inline(always)]
14541454
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
14551455
pub const unsafe fn write(self, val: T)
@@ -1468,7 +1468,7 @@ impl<T: ?Sized> *mut T {
14681468
/// [`ptr::write_bytes`]: crate::ptr::write_bytes()
14691469
#[doc(alias = "memset")]
14701470
#[stable(feature = "pointer_methods", since = "1.26.0")]
1471-
#[rustc_const_unstable(feature = "const_ptr_write", issue = "86302")]
1471+
#[rustc_const_stable(feature = "const_ptr_write", since = "CURRENT_RUSTC_VERSION")]
14721472
#[inline(always)]
14731473
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
14741474
pub const unsafe fn write_bytes(self, val: u8, count: usize)
@@ -1509,7 +1509,7 @@ impl<T: ?Sized> *mut T {
15091509
///
15101510
/// [`ptr::write_unaligned`]: crate::ptr::write_unaligned()
15111511
#[stable(feature = "pointer_methods", since = "1.26.0")]
1512-
#[rustc_const_unstable(feature = "const_ptr_write", issue = "86302")]
1512+
#[rustc_const_stable(feature = "const_ptr_write", since = "CURRENT_RUSTC_VERSION")]
15131513
#[inline(always)]
15141514
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
15151515
pub const unsafe fn write_unaligned(self, val: T)

‎core/src/ptr/non_null.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1013,7 +1013,7 @@ impl<T: ?Sized> NonNull<T> {
10131013
#[inline(always)]
10141014
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
10151015
#[stable(feature = "non_null_convenience", since = "1.80.0")]
1016-
#[rustc_const_unstable(feature = "const_ptr_write", issue = "86302")]
1016+
#[rustc_const_stable(feature = "const_ptr_write", since = "CURRENT_RUSTC_VERSION")]
10171017
pub const unsafe fn write(self, val: T)
10181018
where
10191019
T: Sized,
@@ -1032,7 +1032,7 @@ impl<T: ?Sized> NonNull<T> {
10321032
#[doc(alias = "memset")]
10331033
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
10341034
#[stable(feature = "non_null_convenience", since = "1.80.0")]
1035-
#[rustc_const_unstable(feature = "const_ptr_write", issue = "86302")]
1035+
#[rustc_const_stable(feature = "const_ptr_write", since = "CURRENT_RUSTC_VERSION")]
10361036
pub const unsafe fn write_bytes(self, val: u8, count: usize)
10371037
where
10381038
T: Sized,
@@ -1073,7 +1073,7 @@ impl<T: ?Sized> NonNull<T> {
10731073
#[inline(always)]
10741074
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
10751075
#[stable(feature = "non_null_convenience", since = "1.80.0")]
1076-
#[rustc_const_unstable(feature = "const_ptr_write", issue = "86302")]
1076+
#[rustc_const_stable(feature = "const_ptr_write", since = "CURRENT_RUSTC_VERSION")]
10771077
pub const unsafe fn write_unaligned(self, val: T)
10781078
where
10791079
T: Sized,

‎core/tests/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#![feature(const_option_ext)]
2929
#![feature(const_pin)]
3030
#![feature(const_pointer_is_aligned)]
31-
#![feature(const_ptr_write)]
3231
#![feature(const_three_way_compare)]
3332
#![feature(const_trait_impl)]
3433
#![feature(core_intrinsics)]

0 commit comments

Comments
 (0)