Skip to content

Commit f12affe

Browse files
oli-obkoli-obk
committed
Address review comments
1 parent 3abc727 commit f12affe

File tree

2 files changed

+1
-66
lines changed

2 files changed

+1
-66
lines changed

‎src/libcore/sync/atomic.rs

-65
Original file line numberDiff line numberDiff line change
@@ -1186,11 +1186,6 @@ macro_rules! atomic_int {
11861186
$stable_from:meta,
11871187
$stable_nand:meta,
11881188
$const_stable:meta,
1189-
$const_stable_cxchg:meta,
1190-
$const_stable_debug:meta,
1191-
$const_stable_access:meta,
1192-
$const_stable_from:meta,
1193-
$const_stable_nand:meta,
11941189
$stable_init_const:meta,
11951190
$s_int_type:expr, $int_ref:expr,
11961191
$extra_feature:expr,
@@ -1988,11 +1983,6 @@ atomic_int! {
19881983
stable(feature = "integer_atomics_stable", since = "1.34.0"),
19891984
stable(feature = "integer_atomics_stable", since = "1.34.0"),
19901985
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
1991-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
1992-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
1993-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
1994-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
1995-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
19961986
unstable(feature = "integer_atomics", issue = "32976"),
19971987
"i8", "../../../std/primitive.i8.html",
19981988
"",
@@ -2011,11 +2001,6 @@ atomic_int! {
20112001
stable(feature = "integer_atomics_stable", since = "1.34.0"),
20122002
stable(feature = "integer_atomics_stable", since = "1.34.0"),
20132003
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2014-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2015-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2016-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2017-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2018-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
20192004
unstable(feature = "integer_atomics", issue = "32976"),
20202005
"u8", "../../../std/primitive.u8.html",
20212006
"",
@@ -2034,11 +2019,6 @@ atomic_int! {
20342019
stable(feature = "integer_atomics_stable", since = "1.34.0"),
20352020
stable(feature = "integer_atomics_stable", since = "1.34.0"),
20362021
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2037-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2038-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2039-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2040-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2041-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
20422022
unstable(feature = "integer_atomics", issue = "32976"),
20432023
"i16", "../../../std/primitive.i16.html",
20442024
"",
@@ -2057,11 +2037,6 @@ atomic_int! {
20572037
stable(feature = "integer_atomics_stable", since = "1.34.0"),
20582038
stable(feature = "integer_atomics_stable", since = "1.34.0"),
20592039
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2060-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2061-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2062-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2063-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2064-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
20652040
unstable(feature = "integer_atomics", issue = "32976"),
20662041
"u16", "../../../std/primitive.u16.html",
20672042
"",
@@ -2080,11 +2055,6 @@ atomic_int! {
20802055
stable(feature = "integer_atomics_stable", since = "1.34.0"),
20812056
stable(feature = "integer_atomics_stable", since = "1.34.0"),
20822057
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2083-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2084-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2085-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2086-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2087-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
20882058
unstable(feature = "integer_atomics", issue = "32976"),
20892059
"i32", "../../../std/primitive.i32.html",
20902060
"",
@@ -2103,11 +2073,6 @@ atomic_int! {
21032073
stable(feature = "integer_atomics_stable", since = "1.34.0"),
21042074
stable(feature = "integer_atomics_stable", since = "1.34.0"),
21052075
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2106-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2107-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2108-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2109-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2110-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
21112076
unstable(feature = "integer_atomics", issue = "32976"),
21122077
"u32", "../../../std/primitive.u32.html",
21132078
"",
@@ -2126,11 +2091,6 @@ atomic_int! {
21262091
stable(feature = "integer_atomics_stable", since = "1.34.0"),
21272092
stable(feature = "integer_atomics_stable", since = "1.34.0"),
21282093
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2129-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2130-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2131-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2132-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2133-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
21342094
unstable(feature = "integer_atomics", issue = "32976"),
21352095
"i64", "../../../std/primitive.i64.html",
21362096
"",
@@ -2149,11 +2109,6 @@ atomic_int! {
21492109
stable(feature = "integer_atomics_stable", since = "1.34.0"),
21502110
stable(feature = "integer_atomics_stable", since = "1.34.0"),
21512111
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2152-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2153-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2154-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2155-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2156-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
21572112
unstable(feature = "integer_atomics", issue = "32976"),
21582113
"u64", "../../../std/primitive.u64.html",
21592114
"",
@@ -2172,11 +2127,6 @@ atomic_int! {
21722127
unstable(feature = "integer_atomics", issue = "32976"),
21732128
unstable(feature = "integer_atomics", issue = "32976"),
21742129
rustc_const_unstable(feature = "const_integer_atomics", issue = "32976"),
2175-
rustc_const_unstable(feature = "const_integer_atomics", issue = "32976"),
2176-
rustc_const_unstable(feature = "const_integer_atomics", issue = "32976"),
2177-
rustc_const_unstable(feature = "const_integer_atomics", issue = "32976"),
2178-
rustc_const_unstable(feature = "const_integer_atomics", issue = "32976"),
2179-
rustc_const_unstable(feature = "const_integer_atomics", issue = "32976"),
21802130
unstable(feature = "integer_atomics", issue = "32976"),
21812131
"i128", "../../../std/primitive.i128.html",
21822132
"#![feature(integer_atomics)]\n\n",
@@ -2195,11 +2145,6 @@ atomic_int! {
21952145
unstable(feature = "integer_atomics", issue = "32976"),
21962146
unstable(feature = "integer_atomics", issue = "32976"),
21972147
rustc_const_unstable(feature = "const_integer_atomics", issue = "32976"),
2198-
rustc_const_unstable(feature = "const_integer_atomics", issue = "32976"),
2199-
rustc_const_unstable(feature = "const_integer_atomics", issue = "32976"),
2200-
rustc_const_unstable(feature = "const_integer_atomics", issue = "32976"),
2201-
rustc_const_unstable(feature = "const_integer_atomics", issue = "32976"),
2202-
rustc_const_unstable(feature = "const_integer_atomics", issue = "32976"),
22032148
unstable(feature = "integer_atomics", issue = "32976"),
22042149
"u128", "../../../std/primitive.u128.html",
22052150
"#![feature(integer_atomics)]\n\n",
@@ -2233,11 +2178,6 @@ atomic_int!{
22332178
stable(feature = "atomic_from", since = "1.23.0"),
22342179
stable(feature = "atomic_nand", since = "1.27.0"),
22352180
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2236-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2237-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2238-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2239-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2240-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
22412181
stable(feature = "rust1", since = "1.0.0"),
22422182
"isize", "../../../std/primitive.isize.html",
22432183
"",
@@ -2256,11 +2196,6 @@ atomic_int!{
22562196
stable(feature = "atomic_from", since = "1.23.0"),
22572197
stable(feature = "atomic_nand", since = "1.27.0"),
22582198
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2259-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2260-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2261-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2262-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
2263-
rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
22642199
stable(feature = "rust1", since = "1.0.0"),
22652200
"usize", "../../../std/primitive.usize.html",
22662201
"",

‎src/libsyntax_expand/base.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,7 @@ impl SyntaxExtension {
777777
let is_builtin = attr::contains_name(attrs, sym::rustc_builtin_macro);
778778
let (stability, const_stability) = attr::find_stability(&sess, attrs, span);
779779
if const_stability.is_some() {
780-
sess.span_diagnostic.span_err(span, "macros can't have const stability attributes");
780+
sess.span_diagnostic.span_err(span, "macros cannot have const stability attributes");
781781
}
782782

783783
SyntaxExtension {

0 commit comments

Comments
 (0)