Slight rewording of diagnostic message

estebank · estebank · commit 144e2594458f · 2020-02-02T11:53:10.000-08:00
diff --git a/src/librustc/traits/object_safety.rs b/src/librustc/traits/object_safety.rs
@@ -44,7 +44,7 @@ impl ObjectSafetyViolation {
     pub fn error_msg(&self) -> Cow<'static, str> {
         match *self {
             ObjectSafetyViolation::SizedSelf(_) => {
-                "the trait cannot require that `Self : Sized`".into()
+                "traits that require `Self: Sized` cannot be made into an object".into()
             }
             ObjectSafetyViolation::SupertraitSelf => {
                 "the trait cannot use `Self` as a type parameter \
diff --git a/src/test/ui/did_you_mean/trait-object-reference-without-parens-suggestion.stderr b/src/test/ui/did_you_mean/trait-object-reference-without-parens-suggestion.stderr
@@ -16,7 +16,7 @@ error[E0038]: the trait `std::marker::Copy` cannot be made into an object
 LL |     let _: &Copy + 'static;
    |            ^^^^^ the trait `std::marker::Copy` cannot be made into an object
    |
-   = note: the trait cannot require that `Self : Sized`
+   = note: traits that require `Self: Sized` cannot be made into an object
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/feature-gates/feature-gate-object_safe_for_dispatch.stderr b/src/test/ui/feature-gates/feature-gate-object_safe_for_dispatch.stderr
@@ -2,7 +2,7 @@ error[E0038]: the trait `NonObjectSafe1` cannot be made into an object
   --> $DIR/feature-gate-object_safe_for_dispatch.rs:18:38
    |
 LL | trait NonObjectSafe1: Sized {}
-   |                       ----- the trait cannot require that `Self : Sized`
+   |                       ----- traits that require `Self: Sized` cannot be made into an object
 ...
 LL | fn takes_non_object_safe_ref<T>(obj: &dyn NonObjectSafe1) {
    |                                      ^^^^^^^^^^^^^^^^^^^ the trait `NonObjectSafe1` cannot be made into an object
@@ -38,7 +38,7 @@ error[E0038]: the trait `NonObjectSafe1` cannot be made into an object
   --> $DIR/feature-gate-object_safe_for_dispatch.rs:38:6
    |
 LL | trait NonObjectSafe1: Sized {}
-   |                       ----- the trait cannot require that `Self : Sized`
+   |                       ----- traits that require `Self: Sized` cannot be made into an object
 ...
 LL | impl Trait for dyn NonObjectSafe1 {}
    |      ^^^^^ the trait `NonObjectSafe1` cannot be made into an object
diff --git a/src/test/ui/issues/issue-20692.stderr b/src/test/ui/issues/issue-20692.stderr
@@ -2,9 +2,9 @@ error[E0038]: the trait `Array` cannot be made into an object
   --> $DIR/issue-20692.rs:7:5
    |
 LL | trait Array: Sized + Copy {}
-   |              -----   ---- the trait cannot require that `Self : Sized`
+   |              -----   ---- traits that require `Self: Sized` cannot be made into an object
    |              |
-   |              the trait cannot require that `Self : Sized`
+   |              traits that require `Self: Sized` cannot be made into an object
 ...
 LL |     &dyn Array;
    |     ^^^^^^^^^^ the trait `Array` cannot be made into an object
@@ -13,9 +13,9 @@ error[E0038]: the trait `Array` cannot be made into an object
   --> $DIR/issue-20692.rs:4:13
    |
 LL | trait Array: Sized + Copy {}
-   |              -----   ---- the trait cannot require that `Self : Sized`
+   |              -----   ---- traits that require `Self: Sized` cannot be made into an object
    |              |
-   |              the trait cannot require that `Self : Sized`
+   |              traits that require `Self: Sized` cannot be made into an object
 ...
 LL |     let _ = x
    |             ^ the trait `Array` cannot be made into an object
diff --git a/src/test/ui/kindck/kindck-inherited-copy-bound.curr.stderr b/src/test/ui/kindck/kindck-inherited-copy-bound.curr.stderr
@@ -13,7 +13,7 @@ error[E0038]: the trait `Foo` cannot be made into an object
   --> $DIR/kindck-inherited-copy-bound.rs:28:19
    |
 LL | trait Foo : Copy {
-   |             ---- the trait cannot require that `Self : Sized`
+   |             ---- traits that require `Self: Sized` cannot be made into an object
 ...
 LL |     let z = &x as &dyn Foo;
    |                   ^^^^^^^^ the trait `Foo` cannot be made into an object
@@ -22,7 +22,7 @@ error[E0038]: the trait `Foo` cannot be made into an object
   --> $DIR/kindck-inherited-copy-bound.rs:28:13
    |
 LL | trait Foo : Copy {
-   |             ---- the trait cannot require that `Self : Sized`
+   |             ---- traits that require `Self: Sized` cannot be made into an object
 ...
 LL |     let z = &x as &dyn Foo;
    |             ^^ the trait `Foo` cannot be made into an object
diff --git a/src/test/ui/kindck/kindck-inherited-copy-bound.object_safe_for_dispatch.stderr b/src/test/ui/kindck/kindck-inherited-copy-bound.object_safe_for_dispatch.stderr
@@ -13,7 +13,7 @@ error[E0038]: the trait `Foo` cannot be made into an object
   --> $DIR/kindck-inherited-copy-bound.rs:28:13
    |
 LL | trait Foo : Copy {
-   |             ---- the trait cannot require that `Self : Sized`
+   |             ---- traits that require `Self: Sized` cannot be made into an object
 ...
 LL |     let z = &x as &dyn Foo;
    |             ^^ the trait `Foo` cannot be made into an object
diff --git a/src/test/ui/object-safety/object-safety-sized-2.curr.stderr b/src/test/ui/object-safety/object-safety-sized-2.curr.stderr
@@ -2,7 +2,7 @@ error[E0038]: the trait `Bar` cannot be made into an object
   --> $DIR/object-safety-sized-2.rs:14:30
    |
 LL |     where Self : Sized
-   |                  ----- the trait cannot require that `Self : Sized`
+   |                  ----- traits that require `Self: Sized` cannot be made into an object
 ...
 LL | fn make_bar<T:Bar>(t: &T) -> &dyn Bar {
    |                              ^^^^^^^^ the trait `Bar` cannot be made into an object
diff --git a/src/test/ui/object-safety/object-safety-sized-2.object_safe_for_dispatch.stderr b/src/test/ui/object-safety/object-safety-sized-2.object_safe_for_dispatch.stderr
@@ -2,7 +2,7 @@ error[E0038]: the trait `Bar` cannot be made into an object
   --> $DIR/object-safety-sized-2.rs:16:5
    |
 LL |     where Self : Sized
-   |                  ----- the trait cannot require that `Self : Sized`
+   |                  ----- traits that require `Self: Sized` cannot be made into an object
 ...
 LL |     t
    |     ^ the trait `Bar` cannot be made into an object
diff --git a/src/test/ui/object-safety/object-safety-sized.curr.stderr b/src/test/ui/object-safety/object-safety-sized.curr.stderr
@@ -2,7 +2,7 @@ error[E0038]: the trait `Bar` cannot be made into an object
   --> $DIR/object-safety-sized.rs:12:30
    |
 LL | trait Bar : Sized {
-   |             ----- the trait cannot require that `Self : Sized`
+   |             ----- traits that require `Self: Sized` cannot be made into an object
 ...
 LL | fn make_bar<T:Bar>(t: &T) -> &dyn Bar {
    |                              ^^^^^^^^ the trait `Bar` cannot be made into an object
diff --git a/src/test/ui/object-safety/object-safety-sized.object_safe_for_dispatch.stderr b/src/test/ui/object-safety/object-safety-sized.object_safe_for_dispatch.stderr
@@ -2,7 +2,7 @@ error[E0038]: the trait `Bar` cannot be made into an object
   --> $DIR/object-safety-sized.rs:14:5
    |
 LL | trait Bar : Sized {
-   |             ----- the trait cannot require that `Self : Sized`
+   |             ----- traits that require `Self: Sized` cannot be made into an object
 ...
 LL |     t
    |     ^ the trait `Bar` cannot be made into an object
diff --git a/src/test/ui/suggestions/object-unsafe-trait-should-use-self.stderr b/src/test/ui/suggestions/object-unsafe-trait-should-use-self.stderr
@@ -15,7 +15,7 @@ error[E0038]: the trait `A` cannot be made into an object
   --> $DIR/object-unsafe-trait-should-use-self.rs:3:13
    |
 LL | trait A: Sized {
-   |          ----- the trait cannot require that `Self : Sized`
+   |          ----- traits that require `Self: Sized` cannot be made into an object
 LL |     fn f(a: A) -> A;
    |             ^ the trait `A` cannot be made into an object
 
diff --git a/src/test/ui/traits/trait-object-macro-matcher.stderr b/src/test/ui/traits/trait-object-macro-matcher.stderr
@@ -10,7 +10,7 @@ error[E0038]: the trait `std::marker::Copy` cannot be made into an object
 LL |     m!(dyn Copy + Send + 'static);
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` cannot be made into an object
    |
-   = note: the trait cannot require that `Self : Sized`
+   = note: traits that require `Self: Sized` cannot be made into an object
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/wf/wf-convert-unsafe-trait-obj-box.stderr b/src/test/ui/wf/wf-convert-unsafe-trait-obj-box.stderr
@@ -2,7 +2,7 @@ error[E0038]: the trait `Trait` cannot be made into an object
   --> $DIR/wf-convert-unsafe-trait-obj-box.rs:16:33
    |
 LL | trait Trait: Sized {}
-   |              ----- the trait cannot require that `Self : Sized`
+   |              ----- traits that require `Self: Sized` cannot be made into an object
 ...
 LL |     let t_box: Box<dyn Trait> = Box::new(S);
    |                                 ^^^^^^^^^^^ the trait `Trait` cannot be made into an object
@@ -14,7 +14,7 @@ error[E0038]: the trait `Trait` cannot be made into an object
   --> $DIR/wf-convert-unsafe-trait-obj-box.rs:17:15
    |
 LL | trait Trait: Sized {}
-   |              ----- the trait cannot require that `Self : Sized`
+   |              ----- traits that require `Self: Sized` cannot be made into an object
 ...
 LL |     takes_box(Box::new(S));
    |               ^^^^^^^^^^^ the trait `Trait` cannot be made into an object
@@ -26,7 +26,7 @@ error[E0038]: the trait `Trait` cannot be made into an object
   --> $DIR/wf-convert-unsafe-trait-obj-box.rs:15:5
    |
 LL | trait Trait: Sized {}
-   |              ----- the trait cannot require that `Self : Sized`
+   |              ----- traits that require `Self: Sized` cannot be made into an object
 ...
 LL |     Box::new(S) as Box<dyn Trait>;
    |     ^^^^^^^^^^^ the trait `Trait` cannot be made into an object
diff --git a/src/test/ui/wf/wf-convert-unsafe-trait-obj.stderr b/src/test/ui/wf/wf-convert-unsafe-trait-obj.stderr
@@ -2,7 +2,7 @@ error[E0038]: the trait `Trait` cannot be made into an object
   --> $DIR/wf-convert-unsafe-trait-obj.rs:16:25
    |
 LL | trait Trait: Sized {}
-   |              ----- the trait cannot require that `Self : Sized`
+   |              ----- traits that require `Self: Sized` cannot be made into an object
 ...
 LL |     let t: &dyn Trait = &S;
    |                         ^^ the trait `Trait` cannot be made into an object
@@ -14,7 +14,7 @@ error[E0038]: the trait `Trait` cannot be made into an object
   --> $DIR/wf-convert-unsafe-trait-obj.rs:17:17
    |
 LL | trait Trait: Sized {}
-   |              ----- the trait cannot require that `Self : Sized`
+   |              ----- traits that require `Self: Sized` cannot be made into an object
 ...
 LL |     takes_trait(&S);
    |                 ^^ the trait `Trait` cannot be made into an object
@@ -26,7 +26,7 @@ error[E0038]: the trait `Trait` cannot be made into an object
   --> $DIR/wf-convert-unsafe-trait-obj.rs:15:5
    |
 LL | trait Trait: Sized {}
-   |              ----- the trait cannot require that `Self : Sized`
+   |              ----- traits that require `Self: Sized` cannot be made into an object
 ...
 LL |     &S as &dyn Trait;
    |     ^^ the trait `Trait` cannot be made into an object
diff --git a/src/test/ui/wf/wf-fn-where-clause.stderr b/src/test/ui/wf/wf-fn-where-clause.stderr
@@ -25,7 +25,7 @@ error[E0038]: the trait `std::marker::Copy` cannot be made into an object
 LL | fn bar() where Vec<dyn Copy>:, {}
    |                ^^^^^^^^^^^^^ the trait `std::marker::Copy` cannot be made into an object
    |
-   = note: the trait cannot require that `Self : Sized`
+   = note: traits that require `Self: Sized` cannot be made into an object
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/wf/wf-unsafe-trait-obj-match.stderr b/src/test/ui/wf/wf-unsafe-trait-obj-match.stderr
@@ -16,7 +16,7 @@ error[E0038]: the trait `Trait` cannot be made into an object
   --> $DIR/wf-unsafe-trait-obj-match.rs:26:21
    |
 LL | trait Trait: Sized {}
-   |              ----- the trait cannot require that `Self : Sized`
+   |              ----- traits that require `Self: Sized` cannot be made into an object
 ...
 LL |         Some(()) => &S,
    |                     ^^ the trait `Trait` cannot be made into an object
@@ -28,7 +28,7 @@ error[E0038]: the trait `Trait` cannot be made into an object
   --> $DIR/wf-unsafe-trait-obj-match.rs:25:25
    |
 LL | trait Trait: Sized {}
-   |              ----- the trait cannot require that `Self : Sized`
+   |              ----- traits that require `Self: Sized` cannot be made into an object
 ...
 LL |     let t: &dyn Trait = match opt() {
    |                         ^^^^^^^^^^^ the trait `Trait` cannot be made into an object

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ impl ObjectSafetyViolation {`
`44`	`44`	`pub fn error_msg(&self) -> Cow<'static, str> {`
`45`	`45`	`match *self {`
`46`	`46`	`ObjectSafetyViolation::SizedSelf(_) => {`
`47`		- "the trait cannot require that `Self : Sized`".into()
	`47`	+ "traits that require `Self: Sized` cannot be made into an object".into()
`48`	`48`	`}`
`49`	`49`	`ObjectSafetyViolation::SupertraitSelf => {`
`50`	`50`	"the trait cannot use `Self` as a type parameter \
Original file line number	Diff line number	Diff line change
@@ -16,7 +16,7 @@ error[E0038]: the trait `std::marker::Copy` cannot be made into an object
`16`	`16`	`LL \| let _: &Copy + 'static;`
`17`	`17`	\| ^^^^^ the trait `std::marker::Copy` cannot be made into an object
`18`	`18`	`\|`
`19`		- = note: the trait cannot require that `Self : Sized`
	`19`	+ = note: traits that require `Self: Sized` cannot be made into an object
`20`	`20`
`21`	`21`	`error: aborting due to 3 previous errors`
`22`	`22`
Original file line number	Diff line number	Diff line change
@@ -13,7 +13,7 @@ error[E0038]: the trait `Foo` cannot be made into an object
`13`	`13`	`--> $DIR/kindck-inherited-copy-bound.rs:28:13`
`14`	`14`	`\|`
`15`	`15`	`LL \| trait Foo : Copy {`
`16`		- \| ---- the trait cannot require that `Self : Sized`
	`16`	+ \| ---- traits that require `Self: Sized` cannot be made into an object
`17`	`17`	`...`
`18`	`18`	`LL \| let z = &x as &dyn Foo;`
`19`	`19`	\| ^^ the trait `Foo` cannot be made into an object
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error[E0038]: the trait `Bar` cannot be made into an object
`2`	`2`	`--> $DIR/object-safety-sized-2.rs:14:30`
`3`	`3`	`\|`
`4`	`4`	`LL \| where Self : Sized`
`5`		- \| ----- the trait cannot require that `Self : Sized`
	`5`	+ \| ----- traits that require `Self: Sized` cannot be made into an object
`6`	`6`	`...`
`7`	`7`	`LL \| fn make_bar<T:Bar>(t: &T) -> &dyn Bar {`
`8`	`8`	\| ^^^^^^^^ the trait `Bar` cannot be made into an object
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error[E0038]: the trait `Bar` cannot be made into an object
`2`	`2`	`--> $DIR/object-safety-sized-2.rs:16:5`
`3`	`3`	`\|`
`4`	`4`	`LL \| where Self : Sized`
`5`		- \| ----- the trait cannot require that `Self : Sized`
	`5`	+ \| ----- traits that require `Self: Sized` cannot be made into an object
`6`	`6`	`...`
`7`	`7`	`LL \| t`
`8`	`8`	\| ^ the trait `Bar` cannot be made into an object
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error[E0038]: the trait `Bar` cannot be made into an object
`2`	`2`	`--> $DIR/object-safety-sized.rs:12:30`
`3`	`3`	`\|`
`4`	`4`	`LL \| trait Bar : Sized {`
`5`		- \| ----- the trait cannot require that `Self : Sized`
	`5`	+ \| ----- traits that require `Self: Sized` cannot be made into an object
`6`	`6`	`...`
`7`	`7`	`LL \| fn make_bar<T:Bar>(t: &T) -> &dyn Bar {`
`8`	`8`	\| ^^^^^^^^ the trait `Bar` cannot be made into an object
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error[E0038]: the trait `Bar` cannot be made into an object
`2`	`2`	`--> $DIR/object-safety-sized.rs:14:5`
`3`	`3`	`\|`
`4`	`4`	`LL \| trait Bar : Sized {`
`5`		- \| ----- the trait cannot require that `Self : Sized`
	`5`	+ \| ----- traits that require `Self: Sized` cannot be made into an object
`6`	`6`	`...`
`7`	`7`	`LL \| t`
`8`	`8`	\| ^ the trait `Bar` cannot be made into an object