bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #49963 - llogiq:stabilize-13226, r=kennytm

Browse source 
stabilize fetch_nand

This closes #13226 and makes `Atomic*.fetch_nand` stable.
This commit is contained in:
bors 2018-04-16 07:44:25 +00:00
commit 532764cb79
2 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/libcore/sync/atomic.rs
View file

@ -1360,8 +1360,7 @@ Returns the previous value.
# Examples # Examples
``` ```
", $extra_feature, "#![feature(atomic_nand)] ", $extra_feature, "
use std::sync::atomic::{", stringify!($atomic_type), ", Ordering}; use std::sync::atomic::{", stringify!($atomic_type), ", Ordering};
let foo = ", stringify!($atomic_type), "::new(0x13); let foo = ", stringify!($atomic_type), "::new(0x13);
@ -1555,7 +1554,7 @@ atomic_int! {
unstable(feature = "integer_atomics", issue = "32976"), unstable(feature = "integer_atomics", issue = "32976"),
unstable(feature = "integer_atomics", issue = "32976"), unstable(feature = "integer_atomics", issue = "32976"),
unstable(feature = "integer_atomics", issue = "32976"), unstable(feature = "integer_atomics", issue = "32976"),
unstable(feature = "atomic_nand", issue = "13226"), unstable(feature = "integer_atomics", issue = "32976"),
"i8", "../../../std/primitive.i8.html", "i8", "../../../std/primitive.i8.html",
"#![feature(integer_atomics)]\n\n", "#![feature(integer_atomics)]\n\n",
atomic_min, atomic_max, atomic_min, atomic_max,
@ -1568,7 +1567,7 @@ atomic_int! {
unstable(feature = "integer_atomics", issue = "32976"), unstable(feature = "integer_atomics", issue = "32976"),
unstable(feature = "integer_atomics", issue = "32976"), unstable(feature = "integer_atomics", issue = "32976"),
unstable(feature = "integer_atomics", issue = "32976"), unstable(feature = "integer_atomics", issue = "32976"),
unstable(feature = "atomic_nand", issue = "13226"), unstable(feature = "integer_atomics", issue = "32976"),
"u8", "../../../std/primitive.u8.html", "u8", "../../../std/primitive.u8.html",
"#![feature(integer_atomics)]\n\n", "#![feature(integer_atomics)]\n\n",
atomic_umin, atomic_umax, atomic_umin, atomic_umax,
@ -1581,7 +1580,7 @@ atomic_int! {
unstable(feature = "integer_atomics", issue = "32976"), unstable(feature = "integer_atomics", issue = "32976"),
unstable(feature = "integer_atomics", issue = "32976"), unstable(feature = "integer_atomics", issue = "32976"),
unstable(feature = "integer_atomics", issue = "32976"), unstable(feature = "integer_atomics", issue = "32976"),
unstable(feature = "atomic_nand", issue = "13226"), unstable(feature = "integer_atomics", issue = "32976"),
"i16", "../../../std/primitive.i16.html", "i16", "../../../std/primitive.i16.html",
"#![feature(integer_atomics)]\n\n", "#![feature(integer_atomics)]\n\n",
atomic_min, atomic_max, atomic_min, atomic_max,
@ -1594,7 +1593,7 @@ atomic_int! {
unstable(feature = "integer_atomics", issue = "32976"), unstable(feature = "integer_atomics", issue = "32976"),
unstable(feature = "integer_atomics", issue = "32976"), unstable(feature = "integer_atomics", issue = "32976"),
unstable(feature = "integer_atomics", issue = "32976"), unstable(feature = "integer_atomics", issue = "32976"),
unstable(feature = "atomic_nand", issue = "13226"), unstable(feature = "integer_atomics", issue = "32976"),
"u16", "../../../std/primitive.u16.html", "u16", "../../../std/primitive.u16.html",
"#![feature(integer_atomics)]\n\n", "#![feature(integer_atomics)]\n\n",
atomic_umin, atomic_umax, atomic_umin, atomic_umax,
@ -1607,7 +1606,7 @@ atomic_int! {
unstable(feature = "integer_atomics", issue = "32976"), unstable(feature = "integer_atomics", issue = "32976"),
unstable(feature = "integer_atomics", issue = "32976"), unstable(feature = "integer_atomics", issue = "32976"),
unstable(feature = "integer_atomics", issue = "32976"), unstable(feature = "integer_atomics", issue = "32976"),
unstable(feature = "atomic_nand", issue = "13226"), unstable(feature = "integer_atomics", issue = "32976"),
"i32", "../../../std/primitive.i32.html", "i32", "../../../std/primitive.i32.html",
"#![feature(integer_atomics)]\n\n", "#![feature(integer_atomics)]\n\n",
atomic_min, atomic_max, atomic_min, atomic_max,
@ -1620,7 +1619,7 @@ atomic_int! {
unstable(feature = "integer_atomics", issue = "32976"), unstable(feature = "integer_atomics", issue = "32976"),
unstable(feature = "integer_atomics", issue = "32976"), unstable(feature = "integer_atomics", issue = "32976"),
unstable(feature = "integer_atomics", issue = "32976"), unstable(feature = "integer_atomics", issue = "32976"),
unstable(feature = "atomic_nand", issue = "13226"), unstable(feature = "integer_atomics", issue = "32976"),
"u32", "../../../std/primitive.u32.html", "u32", "../../../std/primitive.u32.html",
"#![feature(integer_atomics)]\n\n", "#![feature(integer_atomics)]\n\n",
atomic_umin, atomic_umax, atomic_umin, atomic_umax,
@ -1633,7 +1632,7 @@ atomic_int! {
unstable(feature = "integer_atomics", issue = "32976"), unstable(feature = "integer_atomics", issue = "32976"),
unstable(feature = "integer_atomics", issue = "32976"), unstable(feature = "integer_atomics", issue = "32976"),
unstable(feature = "integer_atomics", issue = "32976"), unstable(feature = "integer_atomics", issue = "32976"),
unstable(feature = "atomic_nand", issue = "13226"), unstable(feature = "integer_atomics", issue = "32976"),
"i64", "../../../std/primitive.i64.html", "i64", "../../../std/primitive.i64.html",
"#![feature(integer_atomics)]\n\n", "#![feature(integer_atomics)]\n\n",
atomic_min, atomic_max, atomic_min, atomic_max,
@ -1646,7 +1645,7 @@ atomic_int! {
unstable(feature = "integer_atomics", issue = "32976"), unstable(feature = "integer_atomics", issue = "32976"),
unstable(feature = "integer_atomics", issue = "32976"), unstable(feature = "integer_atomics", issue = "32976"),
unstable(feature = "integer_atomics", issue = "32976"), unstable(feature = "integer_atomics", issue = "32976"),
unstable(feature = "atomic_nand", issue = "13226"), unstable(feature = "integer_atomics", issue = "32976"),
"u64", "../../../std/primitive.u64.html", "u64", "../../../std/primitive.u64.html",
"#![feature(integer_atomics)]\n\n", "#![feature(integer_atomics)]\n\n",
atomic_umin, atomic_umax, atomic_umin, atomic_umax,
@ -1659,7 +1658,7 @@ atomic_int!{
stable(feature = "atomic_debug", since = "1.3.0"), stable(feature = "atomic_debug", since = "1.3.0"),
stable(feature = "atomic_access", since = "1.15.0"), stable(feature = "atomic_access", since = "1.15.0"),
stable(feature = "atomic_from", since = "1.23.0"), stable(feature = "atomic_from", since = "1.23.0"),
unstable(feature = "atomic_nand", issue = "13226"), stable(feature = "atomic_nand", since = "1.27.0"),
"isize", "../../../std/primitive.isize.html", "isize", "../../../std/primitive.isize.html",
"", "",
atomic_min, atomic_max, atomic_min, atomic_max,
@ -1672,7 +1671,7 @@ atomic_int!{
stable(feature = "atomic_debug", since = "1.3.0"), stable(feature = "atomic_debug", since = "1.3.0"),
stable(feature = "atomic_access", since = "1.15.0"), stable(feature = "atomic_access", since = "1.15.0"),
stable(feature = "atomic_from", since = "1.23.0"), stable(feature = "atomic_from", since = "1.23.0"),
unstable(feature = "atomic_nand", issue = "13226"), stable(feature = "atomic_nand", since = "1.27.0"),
"usize", "../../../std/primitive.usize.html", "usize", "../../../std/primitive.usize.html",
"", "",
atomic_umin, atomic_umax, atomic_umin, atomic_umax,

2
src/libcore/tests/lib.rs
View file

@ -38,7 +38,7 @@
#![feature(trusted_len)] #![feature(trusted_len)]
#![feature(try_trait)] #![feature(try_trait)]
#![feature(exact_chunks)] #![feature(exact_chunks)]
#![feature(atomic_nand)] #![cfg_attr(stage0, feature(atomic_nand))]
#![feature(reverse_bits)] #![feature(reverse_bits)]
#![feature(inclusive_range_fields)] #![feature(inclusive_range_fields)]
#![feature(iterator_find_map)] #![feature(iterator_find_map)]