Skip to content

Commit 98176fc

Browse files
authored
Rollup merge of rust-lang#61453 - lzutao:nouse-featuregate-integer_atomics, r=sfackler
Remove unneeded feature attr from atomic integers doctests Closes rust-lang#61448 r? @Centril
2 parents 93271d1 + f60b5f1 commit 98176fc

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

src/libcore/sync/atomic.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -1899,7 +1899,7 @@ atomic_int! {
18991899
stable(feature = "integer_atomics_stable", since = "1.34.0"),
19001900
unstable(feature = "integer_atomics", issue = "32976"),
19011901
"i8", "../../../std/primitive.i8.html",
1902-
"#![feature(integer_atomics)]\n\n",
1902+
"",
19031903
atomic_min, atomic_max,
19041904
1,
19051905
"AtomicI8::new(0)",
@@ -1915,7 +1915,7 @@ atomic_int! {
19151915
stable(feature = "integer_atomics_stable", since = "1.34.0"),
19161916
unstable(feature = "integer_atomics", issue = "32976"),
19171917
"u8", "../../../std/primitive.u8.html",
1918-
"#![feature(integer_atomics)]\n\n",
1918+
"",
19191919
atomic_umin, atomic_umax,
19201920
1,
19211921
"AtomicU8::new(0)",
@@ -1931,7 +1931,7 @@ atomic_int! {
19311931
stable(feature = "integer_atomics_stable", since = "1.34.0"),
19321932
unstable(feature = "integer_atomics", issue = "32976"),
19331933
"i16", "../../../std/primitive.i16.html",
1934-
"#![feature(integer_atomics)]\n\n",
1934+
"",
19351935
atomic_min, atomic_max,
19361936
2,
19371937
"AtomicI16::new(0)",
@@ -1947,7 +1947,7 @@ atomic_int! {
19471947
stable(feature = "integer_atomics_stable", since = "1.34.0"),
19481948
unstable(feature = "integer_atomics", issue = "32976"),
19491949
"u16", "../../../std/primitive.u16.html",
1950-
"#![feature(integer_atomics)]\n\n",
1950+
"",
19511951
atomic_umin, atomic_umax,
19521952
2,
19531953
"AtomicU16::new(0)",
@@ -1963,7 +1963,7 @@ atomic_int! {
19631963
stable(feature = "integer_atomics_stable", since = "1.34.0"),
19641964
unstable(feature = "integer_atomics", issue = "32976"),
19651965
"i32", "../../../std/primitive.i32.html",
1966-
"#![feature(integer_atomics)]\n\n",
1966+
"",
19671967
atomic_min, atomic_max,
19681968
4,
19691969
"AtomicI32::new(0)",
@@ -1979,7 +1979,7 @@ atomic_int! {
19791979
stable(feature = "integer_atomics_stable", since = "1.34.0"),
19801980
unstable(feature = "integer_atomics", issue = "32976"),
19811981
"u32", "../../../std/primitive.u32.html",
1982-
"#![feature(integer_atomics)]\n\n",
1982+
"",
19831983
atomic_umin, atomic_umax,
19841984
4,
19851985
"AtomicU32::new(0)",
@@ -1995,7 +1995,7 @@ atomic_int! {
19951995
stable(feature = "integer_atomics_stable", since = "1.34.0"),
19961996
unstable(feature = "integer_atomics", issue = "32976"),
19971997
"i64", "../../../std/primitive.i64.html",
1998-
"#![feature(integer_atomics)]\n\n",
1998+
"",
19991999
atomic_min, atomic_max,
20002000
8,
20012001
"AtomicI64::new(0)",
@@ -2011,7 +2011,7 @@ atomic_int! {
20112011
stable(feature = "integer_atomics_stable", since = "1.34.0"),
20122012
unstable(feature = "integer_atomics", issue = "32976"),
20132013
"u64", "../../../std/primitive.u64.html",
2014-
"#![feature(integer_atomics)]\n\n",
2014+
"",
20152015
atomic_umin, atomic_umax,
20162016
8,
20172017
"AtomicU64::new(0)",

src/test/ui/consts/min_const_fn/min_const_fn_libstd.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![feature(integer_atomics)]
2-
31
// compile-pass
42

53
use std::cell::UnsafeCell;

0 commit comments

Comments
 (0)