Address review comments

2 files changed, 1 insertions, 66 deletions

diff --git a/src/libcore/sync/atomic.rs b/src/libcore/sync/atomic.rs
index 0b22ae69ac2..f3dc9f88c8d 100644
--- a/src/libcore/sync/atomic.rs
+++ b/src/libcore/sync/atomic.rs
@@ -1186,11 +1186,6 @@ macro_rules! atomic_int {
      $stable_from:meta,
      $stable_nand:meta,
      $const_stable:meta,
-     $const_stable_cxchg:meta,
-     $const_stable_debug:meta,
-     $const_stable_access:meta,
-     $const_stable_from:meta,
-     $const_stable_nand:meta,
      $stable_init_const:meta,
      $s_int_type:expr, $int_ref:expr,
      $extra_feature:expr,
@@ -1988,11 +1983,6 @@ atomic_int! {
     stable(feature = "integer_atomics_stable", since = "1.34.0"),
     stable(feature = "integer_atomics_stable", since = "1.34.0"),
     rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
     unstable(feature = "integer_atomics", issue = "32976"),
     "i8", "../../../std/primitive.i8.html",
     "",
@@ -2011,11 +2001,6 @@ atomic_int! {
     stable(feature = "integer_atomics_stable", since = "1.34.0"),
     stable(feature = "integer_atomics_stable", since = "1.34.0"),
     rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
     unstable(feature = "integer_atomics", issue = "32976"),
     "u8", "../../../std/primitive.u8.html",
     "",
@@ -2034,11 +2019,6 @@ atomic_int! {
     stable(feature = "integer_atomics_stable", since = "1.34.0"),
     stable(feature = "integer_atomics_stable", since = "1.34.0"),
     rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
     unstable(feature = "integer_atomics", issue = "32976"),
     "i16", "../../../std/primitive.i16.html",
     "",
@@ -2057,11 +2037,6 @@ atomic_int! {
     stable(feature = "integer_atomics_stable", since = "1.34.0"),
     stable(feature = "integer_atomics_stable", since = "1.34.0"),
     rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
     unstable(feature = "integer_atomics", issue = "32976"),
     "u16", "../../../std/primitive.u16.html",
     "",
@@ -2080,11 +2055,6 @@ atomic_int! {
     stable(feature = "integer_atomics_stable", since = "1.34.0"),
     stable(feature = "integer_atomics_stable", since = "1.34.0"),
     rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
     unstable(feature = "integer_atomics", issue = "32976"),
     "i32", "../../../std/primitive.i32.html",
     "",
@@ -2103,11 +2073,6 @@ atomic_int! {
     stable(feature = "integer_atomics_stable", since = "1.34.0"),
     stable(feature = "integer_atomics_stable", since = "1.34.0"),
     rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
     unstable(feature = "integer_atomics", issue = "32976"),
     "u32", "../../../std/primitive.u32.html",
     "",
@@ -2126,11 +2091,6 @@ atomic_int! {
     stable(feature = "integer_atomics_stable", since = "1.34.0"),
     stable(feature = "integer_atomics_stable", since = "1.34.0"),
     rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
     unstable(feature = "integer_atomics", issue = "32976"),
     "i64", "../../../std/primitive.i64.html",
     "",
@@ -2149,11 +2109,6 @@ atomic_int! {
     stable(feature = "integer_atomics_stable", since = "1.34.0"),
     stable(feature = "integer_atomics_stable", since = "1.34.0"),
     rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
     unstable(feature = "integer_atomics", issue = "32976"),
     "u64", "../../../std/primitive.u64.html",
     "",
@@ -2172,11 +2127,6 @@ atomic_int! {
     unstable(feature = "integer_atomics", issue = "32976"),
     unstable(feature = "integer_atomics", issue = "32976"),
     rustc_const_unstable(feature = "const_integer_atomics", issue = "32976"),
-    rustc_const_unstable(feature = "const_integer_atomics", issue = "32976"),
-    rustc_const_unstable(feature = "const_integer_atomics", issue = "32976"),
-    rustc_const_unstable(feature = "const_integer_atomics", issue = "32976"),
-    rustc_const_unstable(feature = "const_integer_atomics", issue = "32976"),
-    rustc_const_unstable(feature = "const_integer_atomics", issue = "32976"),
     unstable(feature = "integer_atomics", issue = "32976"),
     "i128", "../../../std/primitive.i128.html",
     "#![feature(integer_atomics)]\n\n",
@@ -2195,11 +2145,6 @@ atomic_int! {
     unstable(feature = "integer_atomics", issue = "32976"),
     unstable(feature = "integer_atomics", issue = "32976"),
     rustc_const_unstable(feature = "const_integer_atomics", issue = "32976"),
-    rustc_const_unstable(feature = "const_integer_atomics", issue = "32976"),
-    rustc_const_unstable(feature = "const_integer_atomics", issue = "32976"),
-    rustc_const_unstable(feature = "const_integer_atomics", issue = "32976"),
-    rustc_const_unstable(feature = "const_integer_atomics", issue = "32976"),
-    rustc_const_unstable(feature = "const_integer_atomics", issue = "32976"),
     unstable(feature = "integer_atomics", issue = "32976"),
     "u128", "../../../std/primitive.u128.html",
     "#![feature(integer_atomics)]\n\n",
@@ -2233,11 +2178,6 @@ atomic_int!{
     stable(feature = "atomic_from", since = "1.23.0"),
     stable(feature = "atomic_nand", since = "1.27.0"),
     rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
     stable(feature = "rust1", since = "1.0.0"),
     "isize", "../../../std/primitive.isize.html",
     "",
@@ -2256,11 +2196,6 @@ atomic_int!{
     stable(feature = "atomic_from", since = "1.23.0"),
     stable(feature = "atomic_nand", since = "1.27.0"),
     rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
-    rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
     stable(feature = "rust1", since = "1.0.0"),
     "usize", "../../../std/primitive.usize.html",
     "",
diff --git a/src/libsyntax_expand/base.rs b/src/libsyntax_expand/base.rs
index c7dce93f91b..72c0b3fde02 100644
--- a/src/libsyntax_expand/base.rs
+++ b/src/libsyntax_expand/base.rs
@@ -777,7 +777,7 @@ impl SyntaxExtension {
         let is_builtin = attr::contains_name(attrs, sym::rustc_builtin_macro);
         let (stability, const_stability) = attr::find_stability(&sess, attrs, span);
         if const_stability.is_some() {
-            sess.span_diagnostic.span_err(span, "macros can't have const stability attributes");
+            sess.span_diagnostic.span_err(span, "macros cannot have const stability attributes");
         }
 
         SyntaxExtension {