merged tests/ui/issues/issue-2951.rs with

tests/ui/type/type-parameter-names.rs

Author: reddevilmidzy

tests/ui/issues/issue-2951.rs

@@ -1,14 +1,24 @@
 // Test that we print out the names of type parameters correctly in
 // our error messages.
+// related issue <https://github.com/rust-lang/rust/issues/2951>
 
 //@ dont-require-annotations: NOTE
 
 fn foo<Foo, Bar>(x: Foo) -> Bar {
     x
-//~^ ERROR mismatched types
-//~| NOTE expected type parameter `Bar`, found type parameter `Foo`
-//~| NOTE expected type parameter `Bar`
-//~| NOTE found type parameter `Foo`
+    //~^ ERROR mismatched types
+    //~| NOTE expected type parameter `Bar`, found type parameter `Foo`
+    //~| NOTE expected type parameter `Bar`
+    //~| NOTE found type parameter `Foo`
+}
+
+fn bar<Foo, Bar>(x: Foo, y: Bar) {
+    let mut xx = x;
+    xx = y;
+    //~^ ERROR mismatched types
+    //~| NOTE expected type parameter `Foo`, found type parameter `Bar`
+    //~| NOTE expected type parameter `Foo`
+    //~| NOTE found type parameter `Bar`
 }
 
 fn main() {}

tests/ui/issues/issue-2951.stderr

@@ -1,5 +1,5 @@
 error[E0308]: mismatched types
-  --> $DIR/type-parameter-names.rs:7:5
+  --> $DIR/type-parameter-names.rs:8:5
    |
 LL | fn foo<Foo, Bar>(x: Foo) -> Bar {
    |        ---  ---             --- expected `Bar` because of return type
@@ -15,6 +15,23 @@ LL |     x
    = note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
    = note: the caller chooses a type for `Bar` which can be different from `Foo`
 
-error: aborting due to 1 previous error
+error[E0308]: mismatched types
+  --> $DIR/type-parameter-names.rs:17:10
+   |
+LL | fn bar<Foo, Bar>(x: Foo, y: Bar) {
+   |        ---  --- found type parameter
+   |        |
+   |        expected type parameter
+LL |     let mut xx = x;
+   |                  - expected due to this value
+LL |     xx = y;
+   |          ^ expected type parameter `Foo`, found type parameter `Bar`
+   |
+   = note: expected type parameter `Foo`
+              found type parameter `Bar`
+   = note: a type parameter was expected, but a different one was found; you might be missing a type parameter or trait bound
+   = note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
+
+error: aborting due to 2 previous errors
 
 For more information about this error, try `rustc --explain E0308`.