fix ui tests

these ui changes are closer to what was there before const_trait_impl changes.

tests/ui/suggestions/invalid-bin-op.stderr

@@ -16,6 +16,10 @@ help: consider annotating `S<T>` with `#[derive(PartialEq)]`
 LL + #[derive(PartialEq)]
 LL | struct S<T>(T);
  |
+help: consider introducing a `where` clause, but there might be an alternative better way to express this requirement
+ |
+LL | pub fn foo<T>(s: S<T>, t: S<T>) where S<T>: PartialEq {
+ | +++++++++++++++++++++
 
 error: aborting due to 1 previous error
 

tests/ui/ufcs/ufcs-qpath-self-mismatch.rs

@@ -4,6 +4,7 @@ fn main() {
  <i32 as Add<u32>>::add(1, 2);
  //~^ ERROR cannot add `u32` to `i32`
  //~| ERROR cannot add `u32` to `i32`
+ //~| ERROR cannot add `u32` to `i32`
  <i32 as Add<i32>>::add(1u32, 2);
  //~^ ERROR mismatched types
  <i32 as Add<i32>>::add(1, 2u32);

tests/ui/ufcs/ufcs-qpath-self-mismatch.stderr

@@ -11,16 +11,29 @@ LL | <i32 as Add<u32>>::add(1, 2);
  <&'a i32 as Add<i32>>
  <&i32 as Add<&i32>>
 
+error[E0277]: cannot add `u32` to `i32`
+ --> $DIR/ufcs-qpath-self-mismatch.rs:4:5
+ |
+LL | <i32 as Add<u32>>::add(1, 2);
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no implementation for `i32 + u32`
+ |
+ = help: the trait `Add<u32>` is not implemented for `i32`
+ = help: the following other types implement trait `Add<Rhs>`:
+ <i32 as Add>
+ <i32 as Add<&i32>>
+ <&'a i32 as Add<i32>>
+ <&i32 as Add<&i32>>
+
 error[E0308]: mismatched types
- --> $DIR/ufcs-qpath-self-mismatch.rs:7:28
+ --> $DIR/ufcs-qpath-self-mismatch.rs:8:28
  |
 LL | <i32 as Add<i32>>::add(1u32, 2);
  | ---------------------- ^^^^ expected `i32`, found `u32`
  | |
  | arguments to this function are incorrect
  |
 help: the return type of this call is `u32` due to the type of the argument passed
- --> $DIR/ufcs-qpath-self-mismatch.rs:7:5
+ --> $DIR/ufcs-qpath-self-mismatch.rs:8:5
  |
 LL | <i32 as Add<i32>>::add(1u32, 2);
  | ^^^^^^^^^^^^^^^^^^^^^^^----^^^^
@@ -34,15 +47,15 @@ LL | <i32 as Add<i32>>::add(1i32, 2);
  | ~~~
 
 error[E0308]: mismatched types
- --> $DIR/ufcs-qpath-self-mismatch.rs:9:31
+ --> $DIR/ufcs-qpath-self-mismatch.rs:10:31
  |
 LL | <i32 as Add<i32>>::add(1, 2u32);
  | ---------------------- ^^^^ expected `i32`, found `u32`
  | |
  | arguments to this function are incorrect
  |
 help: the return type of this call is `u32` due to the type of the argument passed
- --> $DIR/ufcs-qpath-self-mismatch.rs:9:5
+ --> $DIR/ufcs-qpath-self-mismatch.rs:10:5
  |
 LL | <i32 as Add<i32>>::add(1, 2u32);
  | ^^^^^^^^^^^^^^^^^^^^^^^^^^----^
@@ -68,7 +81,7 @@ LL | <i32 as Add<u32>>::add(1, 2);
  <&'a i32 as Add<i32>>
  <&i32 as Add<&i32>>
 
-error: aborting due to 4 previous errors
+error: aborting due to 5 previous errors
 
 Some errors have detailed explanations: E0277, E0308.
 For more information about an error, try `rustc --explain E0277`.