Skip to content

Commit d1f8970

Browse files
committed
Auto merge of #58616 - vertexclique:destabilize-fixed-width-atomic-integers, r=dtolnay
Destabilize fixed-width const defined atomic integers With this PR version 1.34.0 onwards const declarations of atomic integers will be unstable. * Closes #58089 * Reverts partially: #57425
2 parents 8a1d0de + 99d67ca commit d1f8970

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

src/libcore/sync/atomic.rs

+14-1
Original file line numberDiff line numberDiff line change
@@ -1131,6 +1131,7 @@ macro_rules! atomic_int {
11311131
$stable_access:meta,
11321132
$stable_from:meta,
11331133
$stable_nand:meta,
1134+
$stable_init_const:meta,
11341135
$s_int_type:expr, $int_ref:expr,
11351136
$extra_feature:expr,
11361137
$min_fn:ident, $max_fn:ident,
@@ -1156,7 +1157,7 @@ macro_rules! atomic_int {
11561157
}
11571158

11581159
/// An atomic integer initialized to `0`.
1159-
#[$stable]
1160+
#[$stable_init_const]
11601161
#[cfg_attr(stage0, rustc_deprecated(
11611162
since = "1.34.0",
11621163
reason = "the `new` function is now preferred",
@@ -1891,6 +1892,7 @@ atomic_int! {
18911892
stable(feature = "integer_atomics_stable", since = "1.34.0"),
18921893
stable(feature = "integer_atomics_stable", since = "1.34.0"),
18931894
stable(feature = "integer_atomics_stable", since = "1.34.0"),
1895+
unstable(feature = "integer_atomics", issue = "32976"),
18941896
"i8", "../../../std/primitive.i8.html",
18951897
"#![feature(integer_atomics)]\n\n",
18961898
atomic_min, atomic_max,
@@ -1906,6 +1908,7 @@ atomic_int! {
19061908
stable(feature = "integer_atomics_stable", since = "1.34.0"),
19071909
stable(feature = "integer_atomics_stable", since = "1.34.0"),
19081910
stable(feature = "integer_atomics_stable", since = "1.34.0"),
1911+
unstable(feature = "integer_atomics", issue = "32976"),
19091912
"u8", "../../../std/primitive.u8.html",
19101913
"#![feature(integer_atomics)]\n\n",
19111914
atomic_umin, atomic_umax,
@@ -1921,6 +1924,7 @@ atomic_int! {
19211924
stable(feature = "integer_atomics_stable", since = "1.34.0"),
19221925
stable(feature = "integer_atomics_stable", since = "1.34.0"),
19231926
stable(feature = "integer_atomics_stable", since = "1.34.0"),
1927+
unstable(feature = "integer_atomics", issue = "32976"),
19241928
"i16", "../../../std/primitive.i16.html",
19251929
"#![feature(integer_atomics)]\n\n",
19261930
atomic_min, atomic_max,
@@ -1936,6 +1940,7 @@ atomic_int! {
19361940
stable(feature = "integer_atomics_stable", since = "1.34.0"),
19371941
stable(feature = "integer_atomics_stable", since = "1.34.0"),
19381942
stable(feature = "integer_atomics_stable", since = "1.34.0"),
1943+
unstable(feature = "integer_atomics", issue = "32976"),
19391944
"u16", "../../../std/primitive.u16.html",
19401945
"#![feature(integer_atomics)]\n\n",
19411946
atomic_umin, atomic_umax,
@@ -1951,6 +1956,7 @@ atomic_int! {
19511956
stable(feature = "integer_atomics_stable", since = "1.34.0"),
19521957
stable(feature = "integer_atomics_stable", since = "1.34.0"),
19531958
stable(feature = "integer_atomics_stable", since = "1.34.0"),
1959+
unstable(feature = "integer_atomics", issue = "32976"),
19541960
"i32", "../../../std/primitive.i32.html",
19551961
"#![feature(integer_atomics)]\n\n",
19561962
atomic_min, atomic_max,
@@ -1966,6 +1972,7 @@ atomic_int! {
19661972
stable(feature = "integer_atomics_stable", since = "1.34.0"),
19671973
stable(feature = "integer_atomics_stable", since = "1.34.0"),
19681974
stable(feature = "integer_atomics_stable", since = "1.34.0"),
1975+
unstable(feature = "integer_atomics", issue = "32976"),
19691976
"u32", "../../../std/primitive.u32.html",
19701977
"#![feature(integer_atomics)]\n\n",
19711978
atomic_umin, atomic_umax,
@@ -1981,6 +1988,7 @@ atomic_int! {
19811988
stable(feature = "integer_atomics_stable", since = "1.34.0"),
19821989
stable(feature = "integer_atomics_stable", since = "1.34.0"),
19831990
stable(feature = "integer_atomics_stable", since = "1.34.0"),
1991+
unstable(feature = "integer_atomics", issue = "32976"),
19841992
"i64", "../../../std/primitive.i64.html",
19851993
"#![feature(integer_atomics)]\n\n",
19861994
atomic_min, atomic_max,
@@ -1996,6 +2004,7 @@ atomic_int! {
19962004
stable(feature = "integer_atomics_stable", since = "1.34.0"),
19972005
stable(feature = "integer_atomics_stable", since = "1.34.0"),
19982006
stable(feature = "integer_atomics_stable", since = "1.34.0"),
2007+
unstable(feature = "integer_atomics", issue = "32976"),
19992008
"u64", "../../../std/primitive.u64.html",
20002009
"#![feature(integer_atomics)]\n\n",
20012010
atomic_umin, atomic_umax,
@@ -2011,6 +2020,7 @@ atomic_int! {
20112020
unstable(feature = "integer_atomics", issue = "32976"),
20122021
unstable(feature = "integer_atomics", issue = "32976"),
20132022
unstable(feature = "integer_atomics", issue = "32976"),
2023+
unstable(feature = "integer_atomics", issue = "32976"),
20142024
"i128", "../../../std/primitive.i128.html",
20152025
"#![feature(integer_atomics)]\n\n",
20162026
atomic_min, atomic_max,
@@ -2026,6 +2036,7 @@ atomic_int! {
20262036
unstable(feature = "integer_atomics", issue = "32976"),
20272037
unstable(feature = "integer_atomics", issue = "32976"),
20282038
unstable(feature = "integer_atomics", issue = "32976"),
2039+
unstable(feature = "integer_atomics", issue = "32976"),
20292040
"u128", "../../../std/primitive.u128.html",
20302041
"#![feature(integer_atomics)]\n\n",
20312042
atomic_umin, atomic_umax,
@@ -2053,6 +2064,7 @@ atomic_int!{
20532064
stable(feature = "atomic_access", since = "1.15.0"),
20542065
stable(feature = "atomic_from", since = "1.23.0"),
20552066
stable(feature = "atomic_nand", since = "1.27.0"),
2067+
stable(feature = "rust1", since = "1.0.0"),
20562068
"isize", "../../../std/primitive.isize.html",
20572069
"",
20582070
atomic_min, atomic_max,
@@ -2068,6 +2080,7 @@ atomic_int!{
20682080
stable(feature = "atomic_access", since = "1.15.0"),
20692081
stable(feature = "atomic_from", since = "1.23.0"),
20702082
stable(feature = "atomic_nand", since = "1.27.0"),
2083+
stable(feature = "rust1", since = "1.0.0"),
20712084
"usize", "../../../std/primitive.usize.html",
20722085
"",
20732086
atomic_umin, atomic_umax,

0 commit comments

Comments
 (0)