80 files changed, 125 insertions, 36 deletions
diff --git a/src/test/ui/methods/assign-to-method.rs b/tests/ui/methods/assign-to-method.rs
index 85beaee8d..85beaee8d 100644
--- a/src/test/ui/methods/assign-to-method.rs
+++ b/tests/ui/methods/assign-to-method.rs
diff --git a/src/test/ui/methods/assign-to-method.stderr b/tests/ui/methods/assign-to-method.stderr
index cafe9abae..cafe9abae 100644
--- a/src/test/ui/methods/assign-to-method.stderr
+++ b/tests/ui/methods/assign-to-method.stderr
diff --git a/src/test/ui/methods/auxiliary/ambig_impl_2_lib.rs b/tests/ui/methods/auxiliary/ambig_impl_2_lib.rs
index 0ed68bf69..0ed68bf69 100644
--- a/src/test/ui/methods/auxiliary/ambig_impl_2_lib.rs
+++ b/tests/ui/methods/auxiliary/ambig_impl_2_lib.rs
diff --git a/src/test/ui/methods/auxiliary/macro-in-other-crate.rs b/tests/ui/methods/auxiliary/macro-in-other-crate.rs
index feda08463..feda08463 100644
--- a/src/test/ui/methods/auxiliary/macro-in-other-crate.rs
+++ b/tests/ui/methods/auxiliary/macro-in-other-crate.rs
diff --git a/src/test/ui/methods/auxiliary/method_self_arg1.rs b/tests/ui/methods/auxiliary/method_self_arg1.rs
index f89019fe5..f89019fe5 100644
--- a/src/test/ui/methods/auxiliary/method_self_arg1.rs
+++ b/tests/ui/methods/auxiliary/method_self_arg1.rs
diff --git a/src/test/ui/methods/auxiliary/method_self_arg2.rs b/tests/ui/methods/auxiliary/method_self_arg2.rs
index 967254562..967254562 100644
--- a/src/test/ui/methods/auxiliary/method_self_arg2.rs
+++ b/tests/ui/methods/auxiliary/method_self_arg2.rs
diff --git a/tests/ui/methods/field-method-suggestion-using-return-ty.rs b/tests/ui/methods/field-method-suggestion-using-return-ty.rs
new file mode 100644
index 000000000..07b975c44
--- /dev/null
+++ b/tests/ui/methods/field-method-suggestion-using-return-ty.rs
@@ -0,0 +1,18 @@
+struct Wrapper<T>(T);
+
+impl Wrapper<Option<i32>> {
+    fn inner_mut(&self) -> Option<&mut i32> {
+        self.as_mut()
+        //~^ ERROR no method named `as_mut` found for reference `&Wrapper<Option<i32>>` in the current scope
+        //~| HELP one of the expressions' fields has a method of the same name
+        //~| HELP items from traits can only be used if
+    }
+
+    fn inner_mut_bad(&self) -> Option<&mut u32> {
+        self.as_mut()
+        //~^ ERROR no method named `as_mut` found for reference `&Wrapper<Option<i32>>` in the current scope
+        //~| HELP items from traits can only be used if
+    }
+}
+
+fn main() {}
diff --git a/tests/ui/methods/field-method-suggestion-using-return-ty.stderr b/tests/ui/methods/field-method-suggestion-using-return-ty.stderr
new file mode 100644
index 000000000..51c52a07e
--- /dev/null
+++ b/tests/ui/methods/field-method-suggestion-using-return-ty.stderr
@@ -0,0 +1,27 @@
+error[E0599]: no method named `as_mut` found for reference `&Wrapper<Option<i32>>` in the current scope
+  --> $DIR/field-method-suggestion-using-return-ty.rs:5:14
+   |
+LL |         self.as_mut()
+   |              ^^^^^^ method not found in `&Wrapper<Option<i32>>`
+   |
+   = help: items from traits can only be used if the trait is implemented and in scope
+   = note: the following trait defines an item `as_mut`, perhaps you need to implement it:
+           candidate #1: `AsMut`
+help: one of the expressions' fields has a method of the same name
+   |
+LL |         self.0.as_mut()
+   |              ++
+
+error[E0599]: no method named `as_mut` found for reference `&Wrapper<Option<i32>>` in the current scope
+  --> $DIR/field-method-suggestion-using-return-ty.rs:12:14
+   |
+LL |         self.as_mut()
+   |              ^^^^^^ method not found in `&Wrapper<Option<i32>>`
+   |
+   = help: items from traits can only be used if the trait is implemented and in scope
+   = note: the following trait defines an item `as_mut`, perhaps you need to implement it:
+           candidate #1: `AsMut`
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0599`.
diff --git a/tests/ui/methods/issues/issue-105732.rs b/tests/ui/methods/issues/issue-105732.rs
new file mode 100644
index 000000000..d70050658
--- /dev/null
+++ b/tests/ui/methods/issues/issue-105732.rs
@@ -0,0 +1,14 @@
+#![feature(auto_traits)]
+
+auto trait Foo {
+    fn g(&self); //~ ERROR auto traits cannot have associated items
+}
+
+trait Bar {
+    fn f(&self) {
+        // issue #105788
+        self.g(); //~ ERROR no method named `g` found for reference `&Self` in the current scope
+    }
+}
+
+fn main() {}
diff --git a/tests/ui/methods/issues/issue-105732.stderr b/tests/ui/methods/issues/issue-105732.stderr
new file mode 100644
index 000000000..769664254
--- /dev/null
+++ b/tests/ui/methods/issues/issue-105732.stderr
@@ -0,0 +1,18 @@
+error[E0380]: auto traits cannot have associated items
+  --> $DIR/issue-105732.rs:4:8
+   |
+LL | auto trait Foo {
+   |            --- auto trait cannot have associated items
+LL |     fn g(&self);
+   |     ---^-------- help: remove these associated items
+
+error[E0599]: no method named `g` found for reference `&Self` in the current scope
+  --> $DIR/issue-105732.rs:10:14
+   |
+LL |         self.g();
+   |              ^ help: there is a method with a similar name: `f`
+
+error: aborting due to 2 previous errors
+
+Some errors have detailed explanations: E0380, E0599.
+For more information about an error, try `rustc --explain E0380`.
diff --git a/src/test/ui/methods/issues/issue-61525.rs b/tests/ui/methods/issues/issue-61525.rs
index c5ca0326e..c5ca0326e 100644
--- a/src/test/ui/methods/issues/issue-61525.rs
+++ b/tests/ui/methods/issues/issue-61525.rs
diff --git a/src/test/ui/methods/issues/issue-61525.stderr b/tests/ui/methods/issues/issue-61525.stderr
index aec968d7c..3e73b950a 100644
--- a/src/test/ui/methods/issues/issue-61525.stderr
+++ b/tests/ui/methods/issues/issue-61525.stderr
@@ -23,7 +23,7 @@ error[E0308]: mismatched types
 LL |         1.query::<dyn ToString>("")
    |           --------------------- ^^ expected trait object `dyn ToString`, found `&str`
    |           |
-   |           arguments to this function are incorrect
+   |           arguments to this method are incorrect
    |
    = note: expected trait object `dyn ToString`
                  found reference `&'static str`
diff --git a/src/test/ui/methods/issues/issue-84495.rs b/tests/ui/methods/issues/issue-84495.rs
index 28c094bf2..28c094bf2 100644
--- a/src/test/ui/methods/issues/issue-84495.rs
+++ b/tests/ui/methods/issues/issue-84495.rs
diff --git a/src/test/ui/methods/issues/issue-84495.stderr b/tests/ui/methods/issues/issue-84495.stderr
index b0217a7c8..b0217a7c8 100644
--- a/src/test/ui/methods/issues/issue-84495.stderr
+++ b/tests/ui/methods/issues/issue-84495.stderr
diff --git a/src/test/ui/methods/issues/issue-90315.rs b/tests/ui/methods/issues/issue-90315.rs
index 79cdc4195..fbecaf9b9 100644
--- a/src/test/ui/methods/issues/issue-90315.rs
+++ b/tests/ui/methods/issues/issue-90315.rs
@@ -69,8 +69,7 @@ fn main() {
     //~^ ERROR `usize` is not an iterator
 
     let _res: i32 = ..6.take(2).sum();
-    //~^ can't call method `take` on ambiguous numeric type
-    //~| ERROR mismatched types [E0308]
+    //~^ ERROR can't call method `take` on ambiguous numeric type
     //~| HELP you must specify a concrete type for this numeric value
     // Won't suggest because `RangeTo` dest not implemented `take`
 }
diff --git a/src/test/ui/methods/issues/issue-90315.stderr b/tests/ui/methods/issues/issue-90315.stderr
index 070cd3054..4d3c086ff 100644
--- a/src/test/ui/methods/issues/issue-90315.stderr
+++ b/tests/ui/methods/issues/issue-90315.stderr
@@ -57,7 +57,7 @@ error[E0308]: mismatched types
   --> $DIR/issue-90315.rs:28:8
    |
 LL |     if 1..(end + 1).is_empty() {
-   |        ^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found struct `std::ops::Range`
+   |        ^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found struct `Range`
    |
    = note: expected type `bool`
             found struct `std::ops::Range<{integer}>`
@@ -77,7 +77,7 @@ error[E0308]: mismatched types
   --> $DIR/issue-90315.rs:34:8
    |
 LL |     if 1..(end + 1).is_sorted() {
-   |        ^^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found struct `std::ops::Range`
+   |        ^^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found struct `Range`
    |
    = note: expected type `bool`
             found struct `std::ops::Range<{integer}>`
@@ -97,7 +97,7 @@ error[E0308]: mismatched types
   --> $DIR/issue-90315.rs:40:21
    |
 LL |     let _res: i32 = 3..6.take(2).sum();
-   |               ---   ^^^^^^^^^^^^^^^^^^ expected `i32`, found struct `std::ops::Range`
+   |               ---   ^^^^^^^^^^^^^^^^^^ expected `i32`, found struct `Range`
    |               |
    |               expected due to this
    |
@@ -119,7 +119,7 @@ error[E0308]: mismatched types
   --> $DIR/issue-90315.rs:45:21
    |
 LL |     let _sum: i32 = 3..6.sum();
-   |               ---   ^^^^^^^^^^ expected `i32`, found struct `std::ops::Range`
+   |               ---   ^^^^^^^^^^ expected `i32`, found struct `Range`
    |               |
    |               expected due to this
    |
@@ -158,7 +158,7 @@ error[E0308]: mismatched types
   --> $DIR/issue-90315.rs:62:8
    |
 LL |     if 1..end.error_method() {
-   |        ^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found struct `std::ops::Range`
+   |        ^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found struct `Range`
    |
    = note: expected type `bool`
             found struct `std::ops::Range<{integer}>`
@@ -184,18 +184,7 @@ help: you must specify a concrete type for this numeric value, like `i32`
 LL |     let _res: i32 = ..6_i32.take(2).sum();
    |                       ~~~~~
 
-error[E0308]: mismatched types
-  --> $DIR/issue-90315.rs:71:21
-   |
-LL |     let _res: i32 = ..6.take(2).sum();
-   |               ---   ^^^^^^^^^^^^^^^^^ expected `i32`, found struct `RangeTo`
-   |               |
-   |               expected due to this
-   |
-   = note: expected type `i32`
-            found struct `RangeTo<_>`
-
-error: aborting due to 19 previous errors
+error: aborting due to 18 previous errors
 
 Some errors have detailed explanations: E0308, E0599, E0689.
 For more information about an error, try `rustc --explain E0308`.
diff --git a/src/test/ui/methods/issues/issue-94581.rs b/tests/ui/methods/issues/issue-94581.rs
index df393e91d..df393e91d 100644
--- a/src/test/ui/methods/issues/issue-94581.rs
+++ b/tests/ui/methods/issues/issue-94581.rs
diff --git a/src/test/ui/methods/issues/issue-94581.stderr b/tests/ui/methods/issues/issue-94581.stderr
index d6be29cf5..d6be29cf5 100644
--- a/src/test/ui/methods/issues/issue-94581.stderr
+++ b/tests/ui/methods/issues/issue-94581.stderr
diff --git a/src/test/ui/methods/method-ambig-one-trait-unknown-int-type.rs b/tests/ui/methods/method-ambig-one-trait-unknown-int-type.rs
index 7b2fc34e1..7b2fc34e1 100644
--- a/src/test/ui/methods/method-ambig-one-trait-unknown-int-type.rs
+++ b/tests/ui/methods/method-ambig-one-trait-unknown-int-type.rs
diff --git a/src/test/ui/methods/method-ambig-one-trait-unknown-int-type.stderr b/tests/ui/methods/method-ambig-one-trait-unknown-int-type.stderr
index e0f8a5447..e0f8a5447 100644
--- a/src/test/ui/methods/method-ambig-one-trait-unknown-int-type.stderr
+++ b/tests/ui/methods/method-ambig-one-trait-unknown-int-type.stderr
diff --git a/src/test/ui/methods/method-ambig-two-traits-cross-crate.rs b/tests/ui/methods/method-ambig-two-traits-cross-crate.rs
index 006e315b0..006e315b0 100644
--- a/src/test/ui/methods/method-ambig-two-traits-cross-crate.rs
+++ b/tests/ui/methods/method-ambig-two-traits-cross-crate.rs
diff --git a/src/test/ui/methods/method-ambig-two-traits-cross-crate.stderr b/tests/ui/methods/method-ambig-two-traits-cross-crate.stderr
index 4b2597eed..4b2597eed 100644
--- a/src/test/ui/methods/method-ambig-two-traits-cross-crate.stderr
+++ b/tests/ui/methods/method-ambig-two-traits-cross-crate.stderr
diff --git a/src/test/ui/methods/method-ambig-two-traits-from-bounds.rs b/tests/ui/methods/method-ambig-two-traits-from-bounds.rs
index e3cc5557f..e3cc5557f 100644
--- a/src/test/ui/methods/method-ambig-two-traits-from-bounds.rs
+++ b/tests/ui/methods/method-ambig-two-traits-from-bounds.rs
diff --git a/src/test/ui/methods/method-ambig-two-traits-from-bounds.stderr b/tests/ui/methods/method-ambig-two-traits-from-bounds.stderr
index 1feaa2c73..1feaa2c73 100644
--- a/src/test/ui/methods/method-ambig-two-traits-from-bounds.stderr
+++ b/tests/ui/methods/method-ambig-two-traits-from-bounds.stderr
diff --git a/src/test/ui/methods/method-ambig-two-traits-from-impls.rs b/tests/ui/methods/method-ambig-two-traits-from-impls.rs
index 22bf84066..22bf84066 100644
--- a/src/test/ui/methods/method-ambig-two-traits-from-impls.rs
+++ b/tests/ui/methods/method-ambig-two-traits-from-impls.rs
diff --git a/src/test/ui/methods/method-ambig-two-traits-from-impls.stderr b/tests/ui/methods/method-ambig-two-traits-from-impls.stderr
index f69b56892..f69b56892 100644
--- a/src/test/ui/methods/method-ambig-two-traits-from-impls.stderr
+++ b/tests/ui/methods/method-ambig-two-traits-from-impls.stderr
diff --git a/src/test/ui/methods/method-ambig-two-traits-from-impls2.rs b/tests/ui/methods/method-ambig-two-traits-from-impls2.rs
index 0a96c1223..0a96c1223 100644
--- a/src/test/ui/methods/method-ambig-two-traits-from-impls2.rs
+++ b/tests/ui/methods/method-ambig-two-traits-from-impls2.rs
diff --git a/src/test/ui/methods/method-ambig-two-traits-from-impls2.stderr b/tests/ui/methods/method-ambig-two-traits-from-impls2.stderr
index 4ba778e0e..4ba778e0e 100644
--- a/src/test/ui/methods/method-ambig-two-traits-from-impls2.stderr
+++ b/tests/ui/methods/method-ambig-two-traits-from-impls2.stderr
diff --git a/src/test/ui/methods/method-ambig-two-traits-with-default-method.rs b/tests/ui/methods/method-ambig-two-traits-with-default-method.rs
index aa7094b9e..aa7094b9e 100644
--- a/src/test/ui/methods/method-ambig-two-traits-with-default-method.rs
+++ b/tests/ui/methods/method-ambig-two-traits-with-default-method.rs
diff --git a/src/test/ui/methods/method-ambig-two-traits-with-default-method.stderr b/tests/ui/methods/method-ambig-two-traits-with-default-method.stderr
index e84dff8ba..e84dff8ba 100644
--- a/src/test/ui/methods/method-ambig-two-traits-with-default-method.stderr
+++ b/tests/ui/methods/method-ambig-two-traits-with-default-method.stderr
diff --git a/src/test/ui/methods/method-argument-inference-associated-type.rs b/tests/ui/methods/method-argument-inference-associated-type.rs
index a3c31fab1..a3c31fab1 100644
--- a/src/test/ui/methods/method-argument-inference-associated-type.rs
+++ b/tests/ui/methods/method-argument-inference-associated-type.rs
diff --git a/tests/ui/methods/method-call-err-msg.rs b/tests/ui/methods/method-call-err-msg.rs
new file mode 100644
index 000000000..4807a956a
--- /dev/null
+++ b/tests/ui/methods/method-call-err-msg.rs
@@ -0,0 +1,22 @@
+// Test that parameter cardinality or missing method error gets span exactly.
+
+pub struct Foo;
+impl Foo {
+    fn zero(self) -> Foo { self }
+    fn one(self, _: isize) -> Foo { self }
+    fn two(self, _: isize, _: isize) -> Foo { self }
+    fn three<T>(self, _: T, _: T, _: T) -> Foo { self }
+}
+
+fn main() {
+    let x = Foo;
+    x.zero(0)   //~ ERROR this method takes 0 arguments but 1 argument was supplied
+     .one()     //~ ERROR this method takes 1 argument but 0 arguments were supplied
+     .two(0);   //~ ERROR this method takes 2 arguments but 1 argument was supplied
+
+    let y = Foo;
+    y.zero()
+     .take()    //~ ERROR not an iterator
+     .one(0);
+    y.three::<usize>(); //~ ERROR this method takes 3 arguments but 0 arguments were supplied
+}
diff --git a/src/test/ui/methods/method-call-err-msg.stderr b/tests/ui/methods/method-call-err-msg.stderr
index a4ffb864d..81269b73b 100644
--- a/src/test/ui/methods/method-call-err-msg.stderr
+++ b/tests/ui/methods/method-call-err-msg.stderr
@@ -1,4 +1,4 @@
-error[E0061]: this function takes 0 arguments but 1 argument was supplied
+error[E0061]: this method takes 0 arguments but 1 argument was supplied
   --> $DIR/method-call-err-msg.rs:13:7
    |
 LL |     x.zero(0)
@@ -14,7 +14,7 @@ help: remove the extra argument
 LL |     x.zero()
    |           ~~
 
-error[E0061]: this function takes 1 argument but 0 arguments were supplied
+error[E0061]: this method takes 1 argument but 0 arguments were supplied
   --> $DIR/method-call-err-msg.rs:14:7
    |
 LL |      .one()
@@ -30,7 +30,7 @@ help: provide the argument
 LL |      .one(/* isize */)
    |          ~~~~~~~~~~~~~
 
-error[E0061]: this function takes 2 arguments but 1 argument was supplied
+error[E0061]: this method takes 2 arguments but 1 argument was supplied
   --> $DIR/method-call-err-msg.rs:15:7
    |
 LL |      .two(0);
@@ -61,16 +61,13 @@ LL |      .take()
    = note: the following trait bounds were not satisfied:
            `Foo: Iterator`
            which is required by `&mut Foo: Iterator`
-note: the following trait must be implemented
+note: the trait `Iterator` must be implemented
   --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
-   |
-LL | pub trait Iterator {
-   | ^^^^^^^^^^^^^^^^^^
    = help: items from traits can only be used if the trait is implemented and in scope
    = note: the following trait defines an item `take`, perhaps you need to implement it:
            candidate #1: `Iterator`
 
-error[E0061]: this function takes 3 arguments but 0 arguments were supplied
+error[E0061]: this method takes 3 arguments but 0 arguments were supplied
   --> $DIR/method-call-err-msg.rs:21:7
    |
 LL |     y.three::<usize>();
diff --git a/src/test/ui/methods/method-call-lifetime-args-fail.rs b/tests/ui/methods/method-call-lifetime-args-fail.rs
index 6bf55844d..6bf55844d 100644
--- a/src/test/ui/methods/method-call-lifetime-args-fail.rs
+++ b/tests/ui/methods/method-call-lifetime-args-fail.rs
diff --git a/src/test/ui/methods/method-call-lifetime-args-fail.stderr b/tests/ui/methods/method-call-lifetime-args-fail.stderr
index 249b48ab1..249b48ab1 100644
--- a/src/test/ui/methods/method-call-lifetime-args-fail.stderr
+++ b/tests/ui/methods/method-call-lifetime-args-fail.stderr
diff --git a/src/test/ui/methods/method-call-lifetime-args-lint-fail.rs b/tests/ui/methods/method-call-lifetime-args-lint-fail.rs
index 23893911e..23893911e 100644
--- a/src/test/ui/methods/method-call-lifetime-args-lint-fail.rs
+++ b/tests/ui/methods/method-call-lifetime-args-lint-fail.rs
diff --git a/src/test/ui/methods/method-call-lifetime-args-lint-fail.stderr b/tests/ui/methods/method-call-lifetime-args-lint-fail.stderr
index 394c1ac3c..394c1ac3c 100644
--- a/src/test/ui/methods/method-call-lifetime-args-lint-fail.stderr
+++ b/tests/ui/methods/method-call-lifetime-args-lint-fail.stderr
diff --git a/src/test/ui/methods/method-call-lifetime-args-lint.rs b/tests/ui/methods/method-call-lifetime-args-lint.rs
index 14729e1e2..14729e1e2 100644
--- a/src/test/ui/methods/method-call-lifetime-args-lint.rs
+++ b/tests/ui/methods/method-call-lifetime-args-lint.rs
diff --git a/src/test/ui/methods/method-call-lifetime-args-lint.stderr b/tests/ui/methods/method-call-lifetime-args-lint.stderr
index b4fc2d717..b4fc2d717 100644
--- a/src/test/ui/methods/method-call-lifetime-args-lint.stderr
+++ b/tests/ui/methods/method-call-lifetime-args-lint.stderr
diff --git a/src/test/ui/methods/method-call-lifetime-args-subst-index.rs b/tests/ui/methods/method-call-lifetime-args-subst-index.rs
index 8df58a348..8df58a348 100644
--- a/src/test/ui/methods/method-call-lifetime-args-subst-index.rs
+++ b/tests/ui/methods/method-call-lifetime-args-subst-index.rs
diff --git a/src/test/ui/methods/method-call-lifetime-args-unresolved.rs b/tests/ui/methods/method-call-lifetime-args-unresolved.rs
index ba7231070..ba7231070 100644
--- a/src/test/ui/methods/method-call-lifetime-args-unresolved.rs
+++ b/tests/ui/methods/method-call-lifetime-args-unresolved.rs
diff --git a/src/test/ui/methods/method-call-lifetime-args-unresolved.stderr b/tests/ui/methods/method-call-lifetime-args-unresolved.stderr
index 62f20d6d5..25ad360b3 100644
--- a/src/test/ui/methods/method-call-lifetime-args-unresolved.stderr
+++ b/tests/ui/methods/method-call-lifetime-args-unresolved.stderr
@@ -11,11 +11,9 @@ warning: cannot specify lifetime arguments explicitly if late bound lifetime par
    |
 LL |     0.clone::<'a>();
    |               ^^
+  --> $SRC_DIR/core/src/clone.rs:LL:COL
    |
-  ::: $SRC_DIR/core/src/clone.rs:LL:COL
-   |
-LL |     fn clone(&self) -> Self;
-   |              - the late bound lifetime parameter is introduced here
+   = note: the late bound lifetime parameter is introduced here
    |
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #42868 <https://github.com/rust-lang/rust/issues/42868>
diff --git a/src/test/ui/methods/method-call-lifetime-args.rs b/tests/ui/methods/method-call-lifetime-args.rs
index 3292e9fcd..3292e9fcd 100644
--- a/src/test/ui/methods/method-call-lifetime-args.rs
+++ b/tests/ui/methods/method-call-lifetime-args.rs
diff --git a/src/test/ui/methods/method-call-lifetime-args.stderr b/tests/ui/methods/method-call-lifetime-args.stderr
index 64ae79e9b..64ae79e9b 100644
--- a/src/test/ui/methods/method-call-lifetime-args.stderr
+++ b/tests/ui/methods/method-call-lifetime-args.stderr
diff --git a/src/test/ui/methods/method-call-type-binding.rs b/tests/ui/methods/method-call-type-binding.rs
index f547ca8d1..f547ca8d1 100644
--- a/src/test/ui/methods/method-call-type-binding.rs
+++ b/tests/ui/methods/method-call-type-binding.rs
diff --git a/src/test/ui/methods/method-call-type-binding.stderr b/tests/ui/methods/method-call-type-binding.stderr
index 4b93082ac..4b93082ac 100644
--- a/src/test/ui/methods/method-call-type-binding.stderr
+++ b/tests/ui/methods/method-call-type-binding.stderr
diff --git a/src/test/ui/methods/method-deref-to-same-trait-object-with-separate-params.rs b/tests/ui/methods/method-deref-to-same-trait-object-with-separate-params.rs
index 9e53ff079..9e53ff079 100644
--- a/src/test/ui/methods/method-deref-to-same-trait-object-with-separate-params.rs
+++ b/tests/ui/methods/method-deref-to-same-trait-object-with-separate-params.rs
diff --git a/src/test/ui/methods/method-deref-to-same-trait-object-with-separate-params.stderr b/tests/ui/methods/method-deref-to-same-trait-object-with-separate-params.stderr
index 82addab94..82addab94 100644
--- a/src/test/ui/methods/method-deref-to-same-trait-object-with-separate-params.stderr
+++ b/tests/ui/methods/method-deref-to-same-trait-object-with-separate-params.stderr
diff --git a/src/test/ui/methods/method-early-bound-lifetimes-on-self.rs b/tests/ui/methods/method-early-bound-lifetimes-on-self.rs
index f2ace32c6..f2ace32c6 100644
--- a/src/test/ui/methods/method-early-bound-lifetimes-on-self.rs
+++ b/tests/ui/methods/method-early-bound-lifetimes-on-self.rs
diff --git a/src/test/ui/methods/method-lookup-order.rs b/tests/ui/methods/method-lookup-order.rs
index 986fe103c..986fe103c 100644
--- a/src/test/ui/methods/method-lookup-order.rs
+++ b/tests/ui/methods/method-lookup-order.rs
diff --git a/src/test/ui/methods/method-macro-backtrace.rs b/tests/ui/methods/method-macro-backtrace.rs
index 00fe32b7c..00fe32b7c 100644
--- a/src/test/ui/methods/method-macro-backtrace.rs
+++ b/tests/ui/methods/method-macro-backtrace.rs
diff --git a/src/test/ui/methods/method-macro-backtrace.stderr b/tests/ui/methods/method-macro-backtrace.stderr
index dd616c4a5..dd616c4a5 100644
--- a/src/test/ui/methods/method-macro-backtrace.stderr
+++ b/tests/ui/methods/method-macro-backtrace.stderr
diff --git a/src/test/ui/methods/method-missing-call.rs b/tests/ui/methods/method-missing-call.rs
index 7ce1e9a4f..7ce1e9a4f 100644
--- a/src/test/ui/methods/method-missing-call.rs
+++ b/tests/ui/methods/method-missing-call.rs
diff --git a/src/test/ui/methods/method-missing-call.stderr b/tests/ui/methods/method-missing-call.stderr
index 040a65d16..040a65d16 100644
--- a/src/test/ui/methods/method-missing-call.stderr
+++ b/tests/ui/methods/method-missing-call.stderr
diff --git a/src/test/ui/methods/method-mut-self-modifies-mut-slice-lvalue.rs b/tests/ui/methods/method-mut-self-modifies-mut-slice-lvalue.rs
index daff037b2..daff037b2 100644
--- a/src/test/ui/methods/method-mut-self-modifies-mut-slice-lvalue.rs
+++ b/tests/ui/methods/method-mut-self-modifies-mut-slice-lvalue.rs
diff --git a/src/test/ui/methods/method-normalize-bounds-issue-20604.rs b/tests/ui/methods/method-normalize-bounds-issue-20604.rs
index 9c0b95284..9c0b95284 100644
--- a/src/test/ui/methods/method-normalize-bounds-issue-20604.rs
+++ b/tests/ui/methods/method-normalize-bounds-issue-20604.rs
diff --git a/src/test/ui/methods/method-not-found-generic-arg-elision.rs b/tests/ui/methods/method-not-found-generic-arg-elision.rs
index 799ced5e9..799ced5e9 100644
--- a/src/test/ui/methods/method-not-found-generic-arg-elision.rs
+++ b/tests/ui/methods/method-not-found-generic-arg-elision.rs
diff --git a/src/test/ui/methods/method-not-found-generic-arg-elision.stderr b/tests/ui/methods/method-not-found-generic-arg-elision.stderr
index fc42d1a4d..f3db56d1d 100644
--- a/src/test/ui/methods/method-not-found-generic-arg-elision.stderr
+++ b/tests/ui/methods/method-not-found-generic-arg-elision.stderr
@@ -23,7 +23,7 @@ error[E0599]: no method named `extend` found for struct `Map` in the current sco
   --> $DIR/method-not-found-generic-arg-elision.rs:87:29
    |
 LL |     v.iter().map(|x| x * x).extend(std::iter::once(100));
-   |                             ^^^^^^ method not found in `Map<std::slice::Iter<'_, i32>, [closure@$DIR/method-not-found-generic-arg-elision.rs:87:18: 87:21]>`
+   |                             ^^^^^^ method not found in `Map<Iter<'_, i32>, [closure@method-not-found-generic-arg-elision.rs:87:18]>`
 
 error[E0599]: no method named `method` found for struct `Wrapper<bool>` in the current scope
   --> $DIR/method-not-found-generic-arg-elision.rs:90:13
@@ -88,9 +88,16 @@ LL | struct Struct<T> {
 LL |     s.method();
    |       ^^^^^^ method cannot be called on `Struct<f64>` due to unsatisfied trait bounds
    |
-   = note: the following trait bounds were not satisfied:
-           `f64: Eq`
-           `f64: Ord`
+note: the following trait bounds were not satisfied:
+      `f64: Eq`
+      `f64: Ord`
+  --> $DIR/method-not-found-generic-arg-elision.rs:74:36
+   |
+LL | impl<T: Clone + Copy + PartialEq + Eq + PartialOrd + Ord> Struct<T> {
+   |                                    ^^                ^^^  ---------
+   |                                    |                 |
+   |                                    |                 unsatisfied trait bound introduced here
+   |                                    unsatisfied trait bound introduced here
 
 error: aborting due to 9 previous errors
 
diff --git a/src/test/ui/methods/method-on-ambiguous-numeric-type.rs b/tests/ui/methods/method-on-ambiguous-numeric-type.rs
index 82f47438d..82f47438d 100644
--- a/src/test/ui/methods/method-on-ambiguous-numeric-type.rs
+++ b/tests/ui/methods/method-on-ambiguous-numeric-type.rs
diff --git a/src/test/ui/methods/method-on-ambiguous-numeric-type.stderr b/tests/ui/methods/method-on-ambiguous-numeric-type.stderr
index 917334116..917334116 100644
--- a/src/test/ui/methods/method-on-ambiguous-numeric-type.stderr
+++ b/tests/ui/methods/method-on-ambiguous-numeric-type.stderr
diff --git a/src/test/ui/methods/method-path-in-pattern.rs b/tests/ui/methods/method-path-in-pattern.rs
index 406453095..406453095 100644
--- a/src/test/ui/methods/method-path-in-pattern.rs
+++ b/tests/ui/methods/method-path-in-pattern.rs
diff --git a/src/test/ui/methods/method-path-in-pattern.stderr b/tests/ui/methods/method-path-in-pattern.stderr
index 63c7abe0e..63c7abe0e 100644
--- a/src/test/ui/methods/method-path-in-pattern.stderr
+++ b/tests/ui/methods/method-path-in-pattern.stderr
diff --git a/src/test/ui/methods/method-probe-no-guessing-dyn-trait.rs b/tests/ui/methods/method-probe-no-guessing-dyn-trait.rs
index ec41b7117..ec41b7117 100644
--- a/src/test/ui/methods/method-probe-no-guessing-dyn-trait.rs
+++ b/tests/ui/methods/method-probe-no-guessing-dyn-trait.rs
diff --git a/src/test/ui/methods/method-projection.rs b/tests/ui/methods/method-projection.rs
index 21d983f19..21d983f19 100644
--- a/src/test/ui/methods/method-projection.rs
+++ b/tests/ui/methods/method-projection.rs
diff --git a/src/test/ui/methods/method-recursive-blanket-impl.rs b/tests/ui/methods/method-recursive-blanket-impl.rs
index a2db75b4e..a2db75b4e 100644
--- a/src/test/ui/methods/method-recursive-blanket-impl.rs
+++ b/tests/ui/methods/method-recursive-blanket-impl.rs
diff --git a/src/test/ui/methods/method-resolvable-path-in-pattern.rs b/tests/ui/methods/method-resolvable-path-in-pattern.rs
index 2973800a4..2973800a4 100644
--- a/src/test/ui/methods/method-resolvable-path-in-pattern.rs
+++ b/tests/ui/methods/method-resolvable-path-in-pattern.rs
diff --git a/src/test/ui/methods/method-resolvable-path-in-pattern.stderr b/tests/ui/methods/method-resolvable-path-in-pattern.stderr
index 7c454a9a7..7c454a9a7 100644
--- a/src/test/ui/methods/method-resolvable-path-in-pattern.stderr
+++ b/tests/ui/methods/method-resolvable-path-in-pattern.stderr
diff --git a/src/test/ui/methods/method-self-arg-1.rs b/tests/ui/methods/method-self-arg-1.rs
index f589f20d8..f589f20d8 100644
--- a/src/test/ui/methods/method-self-arg-1.rs
+++ b/tests/ui/methods/method-self-arg-1.rs
diff --git a/src/test/ui/methods/method-self-arg-1.stderr b/tests/ui/methods/method-self-arg-1.stderr
index 01fec6fca..01fec6fca 100644
--- a/src/test/ui/methods/method-self-arg-1.stderr
+++ b/tests/ui/methods/method-self-arg-1.stderr
diff --git a/src/test/ui/methods/method-self-arg-2.rs b/tests/ui/methods/method-self-arg-2.rs
index 0f8c048ac..0f8c048ac 100644
--- a/src/test/ui/methods/method-self-arg-2.rs
+++ b/tests/ui/methods/method-self-arg-2.rs
diff --git a/src/test/ui/methods/method-self-arg-2.stderr b/tests/ui/methods/method-self-arg-2.stderr
index b98f7a786..b98f7a786 100644
--- a/src/test/ui/methods/method-self-arg-2.stderr
+++ b/tests/ui/methods/method-self-arg-2.stderr
diff --git a/src/test/ui/methods/method-self-arg-aux1.rs b/tests/ui/methods/method-self-arg-aux1.rs
index 79b70a17c..79b70a17c 100644
--- a/src/test/ui/methods/method-self-arg-aux1.rs
+++ b/tests/ui/methods/method-self-arg-aux1.rs
diff --git a/src/test/ui/methods/method-self-arg-aux2.rs b/tests/ui/methods/method-self-arg-aux2.rs
index 16487b54f..16487b54f 100644
--- a/src/test/ui/methods/method-self-arg-aux2.rs
+++ b/tests/ui/methods/method-self-arg-aux2.rs
diff --git a/src/test/ui/methods/method-self-arg-trait.rs b/tests/ui/methods/method-self-arg-trait.rs
index ffa7a552b..ffa7a552b 100644
--- a/src/test/ui/methods/method-self-arg-trait.rs
+++ b/tests/ui/methods/method-self-arg-trait.rs
diff --git a/src/test/ui/methods/method-self-arg.rs b/tests/ui/methods/method-self-arg.rs
index f738fa19c..f738fa19c 100644
--- a/src/test/ui/methods/method-self-arg.rs
+++ b/tests/ui/methods/method-self-arg.rs
diff --git a/src/test/ui/methods/method-trait-object-with-hrtb.rs b/tests/ui/methods/method-trait-object-with-hrtb.rs
index d1bee676c..d1bee676c 100644
--- a/src/test/ui/methods/method-trait-object-with-hrtb.rs
+++ b/tests/ui/methods/method-trait-object-with-hrtb.rs
diff --git a/src/test/ui/methods/method-two-trait-defer-resolution-1.rs b/tests/ui/methods/method-two-trait-defer-resolution-1.rs
index b768620cd..b768620cd 100644
--- a/src/test/ui/methods/method-two-trait-defer-resolution-1.rs
+++ b/tests/ui/methods/method-two-trait-defer-resolution-1.rs
diff --git a/src/test/ui/methods/method-two-trait-defer-resolution-2.rs b/tests/ui/methods/method-two-trait-defer-resolution-2.rs
index fc5766da9..fc5766da9 100644
--- a/src/test/ui/methods/method-two-trait-defer-resolution-2.rs
+++ b/tests/ui/methods/method-two-trait-defer-resolution-2.rs
diff --git a/src/test/ui/methods/method-two-traits-distinguished-via-where-clause.rs b/tests/ui/methods/method-two-traits-distinguished-via-where-clause.rs
index d820d2ad0..d820d2ad0 100644
--- a/src/test/ui/methods/method-two-traits-distinguished-via-where-clause.rs
+++ b/tests/ui/methods/method-two-traits-distinguished-via-where-clause.rs
diff --git a/src/test/ui/methods/method-where-clause.rs b/tests/ui/methods/method-where-clause.rs
index 01692abf9..01692abf9 100644
--- a/src/test/ui/methods/method-where-clause.rs
+++ b/tests/ui/methods/method-where-clause.rs