Change wording for object unsafe because of assoc const

Author: estebank

src/librustc/traits/object_safety.rs

@@ -80,12 +80,10 @@ impl ObjectSafetyViolation {
             ObjectSafetyViolation::Method(name, MethodViolationCode::UndispatchableReceiver, _) => {
                 format!("method `{}`'s `self` parameter cannot be dispatched on", name).into()
             }
-            ObjectSafetyViolation::AssocConst(_, DUMMY_SP) => {
-                "it cannot contain associated consts".into()
-            }
-            ObjectSafetyViolation::AssocConst(name, _) => {
-                format!("it cannot contain associated consts like `{}`", name).into()
+            ObjectSafetyViolation::AssocConst(name, DUMMY_SP) => {
+                format!("it contains associated `const` `{}`", name).into()
             }
+            ObjectSafetyViolation::AssocConst(..) => "it contains this associated `const`".into(),
         }
     }
 

src/test/ui/associated-const/associated-const-in-trait.stderr

@@ -4,7 +4,7 @@ error[E0038]: the trait `Trait` cannot be made into an object
 LL | trait Trait {
    |       ----- this trait cannot be made into an object...
 LL |     const N: usize;
-   |           - ...because it cannot contain associated consts like `N`
+   |           - ...because it contains this associated `const`
 ...
 LL | impl dyn Trait {
    |      ^^^^^^^^^ the trait `Trait` cannot be made into an object

src/test/ui/associated-item/issue-48027.stderr

@@ -4,7 +4,7 @@ error[E0038]: the trait `Bar` cannot be made into an object
 LL | trait Bar {
    |       --- this trait cannot be made into an object...
 LL |     const X: usize;
-   |           - ...because it cannot contain associated consts like `X`
+   |           - ...because it contains this associated `const`
 ...
 LL | impl dyn Bar {}
    |      ^^^^^^^ the trait `Bar` cannot be made into an object

src/test/ui/object-safety/object-safety-associated-consts.curr.stderr

@@ -4,7 +4,7 @@ error[E0038]: the trait `Bar` cannot be made into an object
 LL | trait Bar {
    |       --- this trait cannot be made into an object...
 LL |     const X: usize;
-   |           - ...because it cannot contain associated consts like `X`
+   |           - ...because it contains this associated `const`
 ...
 LL | fn make_bar<T:Bar>(t: &T) -> &dyn Bar {
    |                              ^^^^^^^^ the trait `Bar` cannot be made into an object

src/test/ui/object-safety/object-safety-associated-consts.object_safe_for_dispatch.stderr

@@ -4,7 +4,7 @@ error[E0038]: the trait `Bar` cannot be made into an object
 LL | trait Bar {
    |       --- this trait cannot be made into an object...
 LL |     const X: usize;
-   |           - ...because it cannot contain associated consts like `X`
+   |           - ...because it contains this associated `const`
 ...
 LL |     t
    |     ^ the trait `Bar` cannot be made into an object

src/test/ui/traits/trait-item-privacy.stderr

@@ -111,15 +111,15 @@ error[E0038]: the trait `assoc_const::C` cannot be made into an object
   --> $DIR/trait-item-privacy.rs:101:5
    |
 LL |         const A: u8 = 0;
-   |               - ...because it cannot contain associated consts like `A`
+   |               - ...because it contains this associated `const`
 ...
 LL |         const B: u8 = 0;
-   |               - ...because it cannot contain associated consts like `B`
+   |               - ...because it contains this associated `const`
 ...
 LL |     pub trait C: A + B {
    |               - this trait cannot be made into an object...
 LL |         const C: u8 = 0;
-   |               - ...because it cannot contain associated consts like `C`
+   |               - ...because it contains this associated `const`
 ...
 LL |     C::A;
    |     ^^^^ the trait `assoc_const::C` cannot be made into an object