Rollup merge of #35394 - mikhail-m1:master, r=jonathandturner

Update error format #35304

Fixes #35304 as part of #35233.

r? @jonathandturner

src/test/compile-fail/impl-duplicate-methods.rs

@@ -12,7 +12,9 @@ struct Foo;
 
 impl Foo {
     fn orange(&self) {} //~ NOTE previous definition of `orange` here
-    fn orange(&self) {} //~ ERROR duplicate definitions with name `orange`
+    fn orange(&self) {}
+    //~^ ERROR duplicate definition
+    //~| NOTE duplicate definition
 }
 
 fn main() {}