update error messages and explicitly mention them in tests

lcnr · lcnr · commit 321162b25918 · 2022-05-05T14:29:24.000+02:00
diff --git a/compiler/rustc_typeck/src/coherence/inherent_impls.rs b/compiler/rustc_typeck/src/coherence/inherent_impls.rs
@@ -149,7 +149,7 @@ impl<'tcx> InherentCollect<'tcx> {
                     self.tcx.sess,
                     item.span,
                     E0390,
-                    "cannot define inherent `impl` for a type outside of crate where the type is defined",
+                    "cannot define inherent `impl` for a type outside of the crate where the type is defined",
                 )
                 .help(INTO_DEFINING_CRATE)
                 .span_help(item.span, ADD_ATTR_TO_TY)
@@ -166,7 +166,7 @@ impl<'tcx> InherentCollect<'tcx> {
                         self.tcx.sess,
                         item.span,
                         E0390,
-                        "cannot define inherent `impl` for a type outside of crate where the type is defined",
+                        "cannot define inherent `impl` for a type outside of the crate where the type is defined",
                     )
                     .help(INTO_DEFINING_CRATE)
                     .span_help(impl_item.span, ADD_ATTR)
diff --git a/src/test/ui/incoherent-inherent-impls/needs-has-incoherent-impls.rs b/src/test/ui/incoherent-inherent-impls/needs-has-incoherent-impls.rs
@@ -2,31 +2,37 @@
 #![feature(rustc_attrs)]
 extern crate extern_crate;
 
-impl extern_crate::StructWithAttr { //~ ERROR
+impl extern_crate::StructWithAttr {
+    //~^ ERROR cannot define inherent `impl` for a type outside of the crate
     fn foo() {}
 }
 impl extern_crate::StructWithAttr {
     #[rustc_allow_incoherent_impl]
     fn bar() {}
 }
-impl extern_crate::StructNoAttr { //~ ERROR
+impl extern_crate::StructNoAttr {
+    //~^ ERROR cannot define inherent `impl` for a type outside of the crate
     fn foo() {}
 }
-impl extern_crate::StructNoAttr { //~ ERROR
+impl extern_crate::StructNoAttr {
+    //~^ ERROR cannot define inherent `impl` for a type outside of the crate
     #[rustc_allow_incoherent_impl]
     fn bar() {}
 }
-impl extern_crate::EnumWithAttr { //~ ERROR
+impl extern_crate::EnumWithAttr {
+    //~^ ERROR cannot define inherent `impl` for a type outside of the crate
     fn foo() {}
 }
 impl extern_crate::EnumWithAttr {
     #[rustc_allow_incoherent_impl]
     fn bar() {}
 }
-impl extern_crate::EnumNoAttr { //~ ERROR
+impl extern_crate::EnumNoAttr {
+    //~^ ERROR cannot define inherent `impl` for a type outside of the crate
     fn foo() {}
 }
-impl extern_crate::EnumNoAttr { //~ ERROR
+impl extern_crate::EnumNoAttr {
+    //~^ ERROR cannot define inherent `impl` for a type outside of the crate
     #[rustc_allow_incoherent_impl]
     fn bar() {}
 }
diff --git a/src/test/ui/incoherent-inherent-impls/needs-has-incoherent-impls.stderr b/src/test/ui/incoherent-inherent-impls/needs-has-incoherent-impls.stderr
@@ -1,100 +1,110 @@
-error[E0390]: cannot define inherent `impl` for a type outside of crate where the type is defined
+error[E0390]: cannot define inherent `impl` for a type outside of the crate where the type is defined
   --> $DIR/needs-has-incoherent-impls.rs:5:1
    |
 LL | / impl extern_crate::StructWithAttr {
+LL | |
 LL | |     fn foo() {}
 LL | | }
    | |_^
    |
    = help: consider moving this inherent impl into the crate defining the type if possible
 help: alternatively add `#[rustc_allow_incoherent_impl]` to the relevant impl items
-  --> $DIR/needs-has-incoherent-impls.rs:6:5
+  --> $DIR/needs-has-incoherent-impls.rs:7:5
    |
 LL |     fn foo() {}
    |     ^^^^^^^^^^^
 
-error[E0390]: cannot define inherent `impl` for a type outside of crate where the type is defined
-  --> $DIR/needs-has-incoherent-impls.rs:12:1
+error[E0390]: cannot define inherent `impl` for a type outside of the crate where the type is defined
+  --> $DIR/needs-has-incoherent-impls.rs:13:1
    |
 LL | / impl extern_crate::StructNoAttr {
+LL | |
 LL | |     fn foo() {}
 LL | | }
    | |_^
    |
    = help: consider moving this inherent impl into the crate defining the type if possible
 help: alternatively add `#[rustc_has_incoherent_inherent_impls]` to the type and `#[rustc_allow_incoherent_impl]` to the relevant impl items
-  --> $DIR/needs-has-incoherent-impls.rs:12:1
+  --> $DIR/needs-has-incoherent-impls.rs:13:1
    |
 LL | / impl extern_crate::StructNoAttr {
+LL | |
 LL | |     fn foo() {}
 LL | | }
    | |_^
 
-error[E0390]: cannot define inherent `impl` for a type outside of crate where the type is defined
-  --> $DIR/needs-has-incoherent-impls.rs:15:1
+error[E0390]: cannot define inherent `impl` for a type outside of the crate where the type is defined
+  --> $DIR/needs-has-incoherent-impls.rs:17:1
    |
 LL | / impl extern_crate::StructNoAttr {
+LL | |
 LL | |     #[rustc_allow_incoherent_impl]
 LL | |     fn bar() {}
 LL | | }
    | |_^
    |
    = help: consider moving this inherent impl into the crate defining the type if possible
 help: alternatively add `#[rustc_has_incoherent_inherent_impls]` to the type and `#[rustc_allow_incoherent_impl]` to the relevant impl items
-  --> $DIR/needs-has-incoherent-impls.rs:15:1
+  --> $DIR/needs-has-incoherent-impls.rs:17:1
    |
 LL | / impl extern_crate::StructNoAttr {
+LL | |
 LL | |     #[rustc_allow_incoherent_impl]
 LL | |     fn bar() {}
 LL | | }
    | |_^
 
-error[E0390]: cannot define inherent `impl` for a type outside of crate where the type is defined
-  --> $DIR/needs-has-incoherent-impls.rs:19:1
+error[E0390]: cannot define inherent `impl` for a type outside of the crate where the type is defined
+  --> $DIR/needs-has-incoherent-impls.rs:22:1
    |
 LL | / impl extern_crate::EnumWithAttr {
+LL | |
 LL | |     fn foo() {}
 LL | | }
    | |_^
    |
    = help: consider moving this inherent impl into the crate defining the type if possible
 help: alternatively add `#[rustc_allow_incoherent_impl]` to the relevant impl items
-  --> $DIR/needs-has-incoherent-impls.rs:20:5
+  --> $DIR/needs-has-incoherent-impls.rs:24:5
    |
 LL |     fn foo() {}
    |     ^^^^^^^^^^^
 
-error[E0390]: cannot define inherent `impl` for a type outside of crate where the type is defined
-  --> $DIR/needs-has-incoherent-impls.rs:26:1
+error[E0390]: cannot define inherent `impl` for a type outside of the crate where the type is defined
+  --> $DIR/needs-has-incoherent-impls.rs:30:1
    |
 LL | / impl extern_crate::EnumNoAttr {
+LL | |
 LL | |     fn foo() {}
 LL | | }
    | |_^
    |
    = help: consider moving this inherent impl into the crate defining the type if possible
 help: alternatively add `#[rustc_has_incoherent_inherent_impls]` to the type and `#[rustc_allow_incoherent_impl]` to the relevant impl items
-  --> $DIR/needs-has-incoherent-impls.rs:26:1
+  --> $DIR/needs-has-incoherent-impls.rs:30:1
    |
 LL | / impl extern_crate::EnumNoAttr {
+LL | |
 LL | |     fn foo() {}
 LL | | }
    | |_^
 
-error[E0390]: cannot define inherent `impl` for a type outside of crate where the type is defined
-  --> $DIR/needs-has-incoherent-impls.rs:29:1
+error[E0390]: cannot define inherent `impl` for a type outside of the crate where the type is defined
+  --> $DIR/needs-has-incoherent-impls.rs:34:1
    |
 LL | / impl extern_crate::EnumNoAttr {
+LL | |
 LL | |     #[rustc_allow_incoherent_impl]
 LL | |     fn bar() {}
 LL | | }
    | |_^
    |
    = help: consider moving this inherent impl into the crate defining the type if possible
 help: alternatively add `#[rustc_has_incoherent_inherent_impls]` to the type and `#[rustc_allow_incoherent_impl]` to the relevant impl items
-  --> $DIR/needs-has-incoherent-impls.rs:29:1
+  --> $DIR/needs-has-incoherent-impls.rs:34:1
    |
 LL | / impl extern_crate::EnumNoAttr {
+LL | |
 LL | |     #[rustc_allow_incoherent_impl]
 LL | |     fn bar() {}
 LL | | }
diff --git a/src/test/ui/incoherent-inherent-impls/no-attr-empty-impl.rs b/src/test/ui/incoherent-inherent-impls/no-attr-empty-impl.rs
@@ -1,14 +1,18 @@
 // aux-build:extern-crate.rs
 extern crate extern_crate;
 
-impl extern_crate::StructWithAttr {} //~ ERROR
+impl extern_crate::StructWithAttr {}
+//~^ ERROR cannot define inherent `impl` for a type outside of the crate
 
-impl extern_crate::StructNoAttr {} //~ ERROR
+impl extern_crate::StructNoAttr {}
+//~^ ERROR cannot define inherent `impl` for a type outside of the crate
 
-impl extern_crate::EnumWithAttr {} //~ ERROR
+impl extern_crate::EnumWithAttr {}
+//~^ ERROR cannot define inherent `impl` for a type outside of the crate
 
-impl extern_crate::EnumNoAttr {} //~ ERROR
+impl extern_crate::EnumNoAttr {}
+//~^ ERROR cannot define inherent `impl` for a type outside of the crate
 
-impl f32 {} //~ ERROR
+impl f32 {} //~ ERROR cannot define inherent `impl` for primitive types
 
 fn main() {}
diff --git a/src/test/ui/incoherent-inherent-impls/no-attr-empty-impl.stderr b/src/test/ui/incoherent-inherent-impls/no-attr-empty-impl.stderr
@@ -7,31 +7,31 @@ LL | impl extern_crate::StructWithAttr {}
    = note: define and implement a trait or new type instead
 
 error[E0116]: cannot define inherent `impl` for a type outside of the crate where the type is defined
-  --> $DIR/no-attr-empty-impl.rs:6:1
+  --> $DIR/no-attr-empty-impl.rs:7:1
    |
 LL | impl extern_crate::StructNoAttr {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl for type defined outside of crate.
    |
    = note: define and implement a trait or new type instead
 
 error[E0116]: cannot define inherent `impl` for a type outside of the crate where the type is defined
-  --> $DIR/no-attr-empty-impl.rs:8:1
+  --> $DIR/no-attr-empty-impl.rs:10:1
    |
 LL | impl extern_crate::EnumWithAttr {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl for type defined outside of crate.
    |
    = note: define and implement a trait or new type instead
 
 error[E0116]: cannot define inherent `impl` for a type outside of the crate where the type is defined
-  --> $DIR/no-attr-empty-impl.rs:10:1
+  --> $DIR/no-attr-empty-impl.rs:13:1
    |
 LL | impl extern_crate::EnumNoAttr {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl for type defined outside of crate.
    |
    = note: define and implement a trait or new type instead
 
 error[E0390]: cannot define inherent `impl` for primitive types
-  --> $DIR/no-attr-empty-impl.rs:12:6
+  --> $DIR/no-attr-empty-impl.rs:16:6
    |
 LL | impl f32 {}
    |      ^^^

Original file line number	Diff line number	Diff line change
`@@ -2,31 +2,37 @@`
`2`	`2`	`#![feature(rustc_attrs)]`
`3`	`3`	`extern crate extern_crate;`
`4`	`4`
`5`		`-impl extern_crate::StructWithAttr { //~ ERROR`
	`5`	`+impl extern_crate::StructWithAttr {`
	`6`	+ //~^ ERROR cannot define inherent `impl` for a type outside of the crate
`6`	`7`	`fn foo() {}`
`7`	`8`	`}`
`8`	`9`	`impl extern_crate::StructWithAttr {`
`9`	`10`	`#[rustc_allow_incoherent_impl]`
`10`	`11`	`fn bar() {}`
`11`	`12`	`}`
`12`		`-impl extern_crate::StructNoAttr { //~ ERROR`
	`13`	`+impl extern_crate::StructNoAttr {`
	`14`	+ //~^ ERROR cannot define inherent `impl` for a type outside of the crate
`13`	`15`	`fn foo() {}`
`14`	`16`	`}`
`15`		`-impl extern_crate::StructNoAttr { //~ ERROR`
	`17`	`+impl extern_crate::StructNoAttr {`
	`18`	+ //~^ ERROR cannot define inherent `impl` for a type outside of the crate
`16`	`19`	`#[rustc_allow_incoherent_impl]`
`17`	`20`	`fn bar() {}`
`18`	`21`	`}`
`19`		`-impl extern_crate::EnumWithAttr { //~ ERROR`
	`22`	`+impl extern_crate::EnumWithAttr {`
	`23`	+ //~^ ERROR cannot define inherent `impl` for a type outside of the crate
`20`	`24`	`fn foo() {}`
`21`	`25`	`}`
`22`	`26`	`impl extern_crate::EnumWithAttr {`
`23`	`27`	`#[rustc_allow_incoherent_impl]`
`24`	`28`	`fn bar() {}`
`25`	`29`	`}`
`26`		`-impl extern_crate::EnumNoAttr { //~ ERROR`
	`30`	`+impl extern_crate::EnumNoAttr {`
	`31`	+ //~^ ERROR cannot define inherent `impl` for a type outside of the crate
`27`	`32`	`fn foo() {}`
`28`	`33`	`}`
`29`		`-impl extern_crate::EnumNoAttr { //~ ERROR`
	`34`	`+impl extern_crate::EnumNoAttr {`
	`35`	+ //~^ ERROR cannot define inherent `impl` for a type outside of the crate
`30`	`36`	`#[rustc_allow_incoherent_impl]`
`31`	`37`	`fn bar() {}`
`32`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,31 +7,31 @@ LL \| impl extern_crate::StructWithAttr {}`
`7`	`7`	`= note: define and implement a trait or new type instead`
`8`	`8`
`9`	`9`	error[E0116]: cannot define inherent `impl` for a type outside of the crate where the type is defined
`10`		`- --> $DIR/no-attr-empty-impl.rs:6:1`
	`10`	`+ --> $DIR/no-attr-empty-impl.rs:7:1`
`11`	`11`	`\|`
`12`	`12`	`LL \| impl extern_crate::StructNoAttr {}`
`13`	`13`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl for type defined outside of crate.`
`14`	`14`	`\|`
`15`	`15`	`= note: define and implement a trait or new type instead`
`16`	`16`
`17`	`17`	error[E0116]: cannot define inherent `impl` for a type outside of the crate where the type is defined
`18`		`- --> $DIR/no-attr-empty-impl.rs:8:1`
	`18`	`+ --> $DIR/no-attr-empty-impl.rs:10:1`
`19`	`19`	`\|`
`20`	`20`	`LL \| impl extern_crate::EnumWithAttr {}`
`21`	`21`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl for type defined outside of crate.`
`22`	`22`	`\|`
`23`	`23`	`= note: define and implement a trait or new type instead`
`24`	`24`
`25`	`25`	error[E0116]: cannot define inherent `impl` for a type outside of the crate where the type is defined
`26`		`- --> $DIR/no-attr-empty-impl.rs:10:1`
	`26`	`+ --> $DIR/no-attr-empty-impl.rs:13:1`
`27`	`27`	`\|`
`28`	`28`	`LL \| impl extern_crate::EnumNoAttr {}`
`29`	`29`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl for type defined outside of crate.`
`30`	`30`	`\|`
`31`	`31`	`= note: define and implement a trait or new type instead`
`32`	`32`
`33`	`33`	error[E0390]: cannot define inherent `impl` for primitive types
`34`		`- --> $DIR/no-attr-empty-impl.rs:12:6`
	`34`	`+ --> $DIR/no-attr-empty-impl.rs:16:6`
`35`	`35`	`\|`
`36`	`36`	`LL \| impl f32 {}`
`37`	`37`	`\| ^^^`