Edit feature gate message of impl_restriction to show impl keyword

Author: CoCo-Japan-pan

compiler/rustc_ast_passes/src/feature_gate.rs

@@ -576,7 +576,7 @@ pub fn check_crate(krate: &ast::Crate, sess: &Session, features: &Features) {
     gate_all!(coroutines, "coroutine syntax is experimental");
     gate_all!(const_block_items, "const block items are experimental");
     gate_all!(final_associated_functions, "`final` on trait functions is experimental");
-    gate_all!(impl_restriction, "impl restrictions are experimental");
+    gate_all!(impl_restriction, "`impl` restrictions are experimental");
 
     if !visitor.features.never_patterns() {
         if let Some(spans) = spans.get(&sym::never_patterns) {

tests/ui/impl-restriction/feature-gate-impl-restriction.rs

@@ -6,37 +6,37 @@
 #![cfg_attr(with_gate, allow(incomplete_features))]
 #![feature(auto_traits, const_trait_impl)]
 
-pub impl(crate) trait Bar {} //[without_gate]~ ERROR impl restrictions are experimental
-pub impl(in crate) trait BarInCrate {} //[without_gate]~ ERROR impl restrictions are experimental
+pub impl(crate) trait Bar {} //[without_gate]~ ERROR `impl` restrictions are experimental
+pub impl(in crate) trait BarInCrate {} //[without_gate]~ ERROR `impl` restrictions are experimental
 
 mod foo {
-    pub impl(in crate::foo) trait Baz {} //[without_gate]~ ERROR impl restrictions are experimental
-    pub unsafe impl(super) trait BazUnsafeSuper {} //[without_gate]~ ERROR impl restrictions are experimental
-    pub auto impl(self) trait BazAutoSelf {} //[without_gate]~ ERROR impl restrictions are experimental
-    pub const impl(in self) trait BazConst {} //[without_gate]~ ERROR impl restrictions are experimental
+    pub impl(in crate::foo) trait Baz {} //[without_gate]~ ERROR `impl` restrictions are experimental
+    pub unsafe impl(super) trait BazUnsafeSuper {} //[without_gate]~ ERROR `impl` restrictions are experimental
+    pub auto impl(self) trait BazAutoSelf {} //[without_gate]~ ERROR `impl` restrictions are experimental
+    pub const impl(in self) trait BazConst {} //[without_gate]~ ERROR `impl` restrictions are experimental
 
     mod foo_inner {
-        pub impl(in crate::foo::foo_inner) trait Qux {} //[without_gate]~ ERROR impl restrictions are experimental
-        pub unsafe auto impl(in crate::foo::foo_inner) trait QuxAutoUnsafe {} //[without_gate]~ ERROR impl restrictions are experimental
-        pub const unsafe impl(in crate::foo::foo_inner) trait QuxConstAuto {} //[without_gate]~ ERROR impl restrictions are experimental
+        pub impl(in crate::foo::foo_inner) trait Qux {} //[without_gate]~ ERROR `impl` restrictions are experimental
+        pub unsafe auto impl(in crate::foo::foo_inner) trait QuxAutoUnsafe {} //[without_gate]~ ERROR `impl` restrictions are experimental
+        pub const unsafe impl(in crate::foo::foo_inner) trait QuxConstAuto {} //[without_gate]~ ERROR `impl` restrictions are experimental
     }
 
     #[cfg(false)]
-    pub impl(crate) trait Bar {} //[without_gate]~ ERROR impl restrictions are experimental
+    pub impl(crate) trait Bar {} //[without_gate]~ ERROR `impl` restrictions are experimental
     #[cfg(false)]
-    pub impl(in crate) trait BarInCrate {} //[without_gate]~ ERROR impl restrictions are experimental
+    pub impl(in crate) trait BarInCrate {} //[without_gate]~ ERROR `impl` restrictions are experimental
     #[cfg(false)]
-    pub unsafe impl(self) trait BazUnsafeSelf {} //[without_gate]~ ERROR impl restrictions are experimental
+    pub unsafe impl(self) trait BazUnsafeSelf {} //[without_gate]~ ERROR `impl` restrictions are experimental
     #[cfg(false)]
-    pub auto impl(in super) trait BazAutoSuper {} //[without_gate]~ ERROR impl restrictions are experimental
+    pub auto impl(in super) trait BazAutoSuper {} //[without_gate]~ ERROR `impl` restrictions are experimental
     #[cfg(false)]
-    pub const impl(super) trait BazConstSuper {} //[without_gate]~ ERROR impl restrictions are experimental
+    pub const impl(super) trait BazConstSuper {} //[without_gate]~ ERROR `impl` restrictions are experimental
 
     #[cfg(false)]
     mod cfged_out_foo {
-        pub impl(in crate::foo::cfged_out_foo) trait CfgedOutQux {} //[without_gate]~ ERROR impl restrictions are experimental
-        pub unsafe auto impl(in crate::foo::cfged_out_foo) trait CfgedOutQuxAutoUnsafe {} //[without_gate]~ ERROR impl restrictions are experimental
-        pub const unsafe impl(in crate::foo::cfged_out_foo) trait CfgedOutQuxConstAuto {} //[without_gate]~ ERROR impl restrictions are experimental
+        pub impl(in crate::foo::cfged_out_foo) trait CfgedOutQux {} //[without_gate]~ ERROR `impl` restrictions are experimental
+        pub unsafe auto impl(in crate::foo::cfged_out_foo) trait CfgedOutQuxAutoUnsafe {} //[without_gate]~ ERROR `impl` restrictions are experimental
+        pub const unsafe impl(in crate::foo::cfged_out_foo) trait CfgedOutQuxConstAuto {} //[without_gate]~ ERROR `impl` restrictions are experimental
     }
 
     // auto traits cannot be const, so we do not include these combinations in the test.

tests/ui/impl-restriction/feature-gate-impl-restriction.without_gate.stderr

@@ -1,4 +1,4 @@
-error[E0658]: impl restrictions are experimental
+error[E0658]: `impl` restrictions are experimental
   --> $DIR/feature-gate-impl-restriction.rs:9:5
    |
 LL | pub impl(crate) trait Bar {}
@@ -8,7 +8,7 @@ LL | pub impl(crate) trait Bar {}
    = help: add `#![feature(impl_restriction)]` to the crate attributes to enable
    = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
-error[E0658]: impl restrictions are experimental
+error[E0658]: `impl` restrictions are experimental
   --> $DIR/feature-gate-impl-restriction.rs:10:5
    |
 LL | pub impl(in crate) trait BarInCrate {}
@@ -18,7 +18,7 @@ LL | pub impl(in crate) trait BarInCrate {}
    = help: add `#![feature(impl_restriction)]` to the crate attributes to enable
    = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
-error[E0658]: impl restrictions are experimental
+error[E0658]: `impl` restrictions are experimental
   --> $DIR/feature-gate-impl-restriction.rs:13:9
    |
 LL |     pub impl(in crate::foo) trait Baz {}
@@ -28,7 +28,7 @@ LL |     pub impl(in crate::foo) trait Baz {}
    = help: add `#![feature(impl_restriction)]` to the crate attributes to enable
    = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
-error[E0658]: impl restrictions are experimental
+error[E0658]: `impl` restrictions are experimental
   --> $DIR/feature-gate-impl-restriction.rs:14:16
    |
 LL |     pub unsafe impl(super) trait BazUnsafeSuper {}
@@ -38,7 +38,7 @@ LL |     pub unsafe impl(super) trait BazUnsafeSuper {}
    = help: add `#![feature(impl_restriction)]` to the crate attributes to enable
    = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
-error[E0658]: impl restrictions are experimental
+error[E0658]: `impl` restrictions are experimental
   --> $DIR/feature-gate-impl-restriction.rs:15:14
    |
 LL |     pub auto impl(self) trait BazAutoSelf {}
@@ -48,7 +48,7 @@ LL |     pub auto impl(self) trait BazAutoSelf {}
    = help: add `#![feature(impl_restriction)]` to the crate attributes to enable
    = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
-error[E0658]: impl restrictions are experimental
+error[E0658]: `impl` restrictions are experimental
   --> $DIR/feature-gate-impl-restriction.rs:16:15
    |
 LL |     pub const impl(in self) trait BazConst {}
@@ -58,7 +58,7 @@ LL |     pub const impl(in self) trait BazConst {}
    = help: add `#![feature(impl_restriction)]` to the crate attributes to enable
    = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
-error[E0658]: impl restrictions are experimental
+error[E0658]: `impl` restrictions are experimental
   --> $DIR/feature-gate-impl-restriction.rs:19:13
    |
 LL |         pub impl(in crate::foo::foo_inner) trait Qux {}
@@ -68,7 +68,7 @@ LL |         pub impl(in crate::foo::foo_inner) trait Qux {}
    = help: add `#![feature(impl_restriction)]` to the crate attributes to enable
    = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
-error[E0658]: impl restrictions are experimental
+error[E0658]: `impl` restrictions are experimental
   --> $DIR/feature-gate-impl-restriction.rs:20:25
    |
 LL | ...   pub unsafe auto impl(in crate::foo::foo_inner) trait QuxAutoUnsafe {}
@@ -78,7 +78,7 @@ LL | ...   pub unsafe auto impl(in crate::foo::foo_inner) trait QuxAutoUnsafe {}
    = help: add `#![feature(impl_restriction)]` to the crate attributes to enable
    = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
-error[E0658]: impl restrictions are experimental
+error[E0658]: `impl` restrictions are experimental
   --> $DIR/feature-gate-impl-restriction.rs:21:26
    |
 LL | ...   pub const unsafe impl(in crate::foo::foo_inner) trait QuxConstAuto {}
@@ -88,7 +88,7 @@ LL | ...   pub const unsafe impl(in crate::foo::foo_inner) trait QuxConstAuto {}
    = help: add `#![feature(impl_restriction)]` to the crate attributes to enable
    = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
-error[E0658]: impl restrictions are experimental
+error[E0658]: `impl` restrictions are experimental
   --> $DIR/feature-gate-impl-restriction.rs:25:9
    |
 LL |     pub impl(crate) trait Bar {}
@@ -98,7 +98,7 @@ LL |     pub impl(crate) trait Bar {}
    = help: add `#![feature(impl_restriction)]` to the crate attributes to enable
    = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
-error[E0658]: impl restrictions are experimental
+error[E0658]: `impl` restrictions are experimental
   --> $DIR/feature-gate-impl-restriction.rs:27:9
    |
 LL |     pub impl(in crate) trait BarInCrate {}
@@ -108,7 +108,7 @@ LL |     pub impl(in crate) trait BarInCrate {}
    = help: add `#![feature(impl_restriction)]` to the crate attributes to enable
    = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
-error[E0658]: impl restrictions are experimental
+error[E0658]: `impl` restrictions are experimental
   --> $DIR/feature-gate-impl-restriction.rs:29:16
    |
 LL |     pub unsafe impl(self) trait BazUnsafeSelf {}
@@ -118,7 +118,7 @@ LL |     pub unsafe impl(self) trait BazUnsafeSelf {}
    = help: add `#![feature(impl_restriction)]` to the crate attributes to enable
    = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
-error[E0658]: impl restrictions are experimental
+error[E0658]: `impl` restrictions are experimental
   --> $DIR/feature-gate-impl-restriction.rs:31:14
    |
 LL |     pub auto impl(in super) trait BazAutoSuper {}
@@ -128,7 +128,7 @@ LL |     pub auto impl(in super) trait BazAutoSuper {}
    = help: add `#![feature(impl_restriction)]` to the crate attributes to enable
    = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
-error[E0658]: impl restrictions are experimental
+error[E0658]: `impl` restrictions are experimental
   --> $DIR/feature-gate-impl-restriction.rs:33:15
    |
 LL |     pub const impl(super) trait BazConstSuper {}
@@ -138,7 +138,7 @@ LL |     pub const impl(super) trait BazConstSuper {}
    = help: add `#![feature(impl_restriction)]` to the crate attributes to enable
    = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
-error[E0658]: impl restrictions are experimental
+error[E0658]: `impl` restrictions are experimental
   --> $DIR/feature-gate-impl-restriction.rs:37:13
    |
 LL |         pub impl(in crate::foo::cfged_out_foo) trait CfgedOutQux {}
@@ -148,7 +148,7 @@ LL |         pub impl(in crate::foo::cfged_out_foo) trait CfgedOutQux {}
    = help: add `#![feature(impl_restriction)]` to the crate attributes to enable
    = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
-error[E0658]: impl restrictions are experimental
+error[E0658]: `impl` restrictions are experimental
   --> $DIR/feature-gate-impl-restriction.rs:38:25
    |
 LL | ...   pub unsafe auto impl(in crate::foo::cfged_out_foo) trait CfgedOutQuxAutoUnsafe {}
@@ -158,7 +158,7 @@ LL | ...   pub unsafe auto impl(in crate::foo::cfged_out_foo) trait CfgedOutQuxA
    = help: add `#![feature(impl_restriction)]` to the crate attributes to enable
    = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
-error[E0658]: impl restrictions are experimental
+error[E0658]: `impl` restrictions are experimental
   --> $DIR/feature-gate-impl-restriction.rs:39:26
    |
 LL | ...   pub const unsafe impl(in crate::foo::cfged_out_foo) trait CfgedOutQuxConstAuto {}