Skip to content

Commit

Permalink
Rollup merge of rust-lang#61453 - lzutao:nouse-featuregate-integer_at…
Browse files Browse the repository at this point in the history
…omics, r=sfackler

Remove unneeded feature attr from atomic integers doctests

Closes rust-lang#61448

r? @Centril
  • Loading branch information
pietroalbini committed Jun 4, 2019
2 parents 93271d1 + f60b5f1 commit 98176fc
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
16 changes: 8 additions & 8 deletions src/libcore/sync/atomic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1899,7 +1899,7 @@ atomic_int! {
stable(feature = "integer_atomics_stable", since = "1.34.0"),
unstable(feature = "integer_atomics", issue = "32976"),
"i8", "../../../std/primitive.i8.html",
"#![feature(integer_atomics)]\n\n",
"",
atomic_min, atomic_max,
1,
"AtomicI8::new(0)",
Expand All @@ -1915,7 +1915,7 @@ atomic_int! {
stable(feature = "integer_atomics_stable", since = "1.34.0"),
unstable(feature = "integer_atomics", issue = "32976"),
"u8", "../../../std/primitive.u8.html",
"#![feature(integer_atomics)]\n\n",
"",
atomic_umin, atomic_umax,
1,
"AtomicU8::new(0)",
Expand All @@ -1931,7 +1931,7 @@ atomic_int! {
stable(feature = "integer_atomics_stable", since = "1.34.0"),
unstable(feature = "integer_atomics", issue = "32976"),
"i16", "../../../std/primitive.i16.html",
"#![feature(integer_atomics)]\n\n",
"",
atomic_min, atomic_max,
2,
"AtomicI16::new(0)",
Expand All @@ -1947,7 +1947,7 @@ atomic_int! {
stable(feature = "integer_atomics_stable", since = "1.34.0"),
unstable(feature = "integer_atomics", issue = "32976"),
"u16", "../../../std/primitive.u16.html",
"#![feature(integer_atomics)]\n\n",
"",
atomic_umin, atomic_umax,
2,
"AtomicU16::new(0)",
Expand All @@ -1963,7 +1963,7 @@ atomic_int! {
stable(feature = "integer_atomics_stable", since = "1.34.0"),
unstable(feature = "integer_atomics", issue = "32976"),
"i32", "../../../std/primitive.i32.html",
"#![feature(integer_atomics)]\n\n",
"",
atomic_min, atomic_max,
4,
"AtomicI32::new(0)",
Expand All @@ -1979,7 +1979,7 @@ atomic_int! {
stable(feature = "integer_atomics_stable", since = "1.34.0"),
unstable(feature = "integer_atomics", issue = "32976"),
"u32", "../../../std/primitive.u32.html",
"#![feature(integer_atomics)]\n\n",
"",
atomic_umin, atomic_umax,
4,
"AtomicU32::new(0)",
Expand All @@ -1995,7 +1995,7 @@ atomic_int! {
stable(feature = "integer_atomics_stable", since = "1.34.0"),
unstable(feature = "integer_atomics", issue = "32976"),
"i64", "../../../std/primitive.i64.html",
"#![feature(integer_atomics)]\n\n",
"",
atomic_min, atomic_max,
8,
"AtomicI64::new(0)",
Expand All @@ -2011,7 +2011,7 @@ atomic_int! {
stable(feature = "integer_atomics_stable", since = "1.34.0"),
unstable(feature = "integer_atomics", issue = "32976"),
"u64", "../../../std/primitive.u64.html",
"#![feature(integer_atomics)]\n\n",
"",
atomic_umin, atomic_umax,
8,
"AtomicU64::new(0)",
Expand Down
2 changes: 0 additions & 2 deletions src/test/ui/consts/min_const_fn/min_const_fn_libstd.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#![feature(integer_atomics)]

// compile-pass

use std::cell::UnsafeCell;
Expand Down

0 comments on commit 98176fc

Please sign in to comment.