Fix rebase

Author: estebank

src/test/ui/closure-expected-type/expect-two-infer-vars-supply-ty-with-bound-region.stderr

@@ -3,6 +3,11 @@ error[E0282]: type annotations needed
    |
 LL |     with_closure(|x: u32, y| {});
    |                           ^ consider giving this closure parameter a type
+   |
+help: consider specifying the type arguments in the function call
+   |
+LL |     with_closure::<F, A, B>(|x: u32, y| {});
+   |                 ^^^^^^^^^^^
 
 error: aborting due to previous error
 

src/test/ui/issues/issue-23046.stderr

@@ -3,6 +3,11 @@ error[E0282]: type annotations needed for `Expr<'_, VAR>`
    |
 LL |     let ex = |x| {
    |               ^ consider giving this closure parameter the explicit type `Expr<'_, VAR>`, where the type parameter `VAR` is specified
+   |
+help: consider specifying the type arguments in the function call
+   |
+LL |         let_::<VAR, F>(add(x,x), |y| {
+   |             ^^^^^^^^^^
 
 error: aborting due to previous error
 

src/test/ui/issues/issue-72690.stderr

@@ -11,7 +11,7 @@ error[E0283]: type annotations needed
   --> $DIR/issue-72690.rs:11:9
    |
 LL |     |x| String::from("x".as_ref());
-   |         ^^^^^^^^^^^^ cannot infer type for struct `String`
+   |         ^^^^^^^^^^^^ cannot infer type for reference `&_`
    |
    = note: cannot satisfy `String: From<&_>`
    = note: required by `from`
@@ -20,11 +20,13 @@ error[E0283]: type annotations needed for `&T`
   --> $DIR/issue-72690.rs:15:17
    |
 LL |     let _ = "x".as_ref();
-   |         -       ^^^^^^ cannot infer type for type parameter `T` declared on the trait `AsRef`
-   |         |
-   |         consider giving this pattern the explicit type `&T`, where the type parameter `T` is specified
+   |                 ^^^^^^ cannot infer type for type parameter `T` declared on the trait `AsRef`
    |
    = note: cannot satisfy `str: AsRef<_>`
+help: consider giving this binding the explicit type `&T`, where the type parameter `T` is specified
+   |
+LL |     let _: str = "x".as_ref();
+   |          ^^^^^
 
 error[E0283]: type annotations needed
   --> $DIR/issue-72690.rs:19:5
@@ -61,10 +63,6 @@ LL |     String::from("x".as_ref());
    |
    = note: cannot satisfy `String: From<&_>`
    = note: required by `from`
-help: consider giving this binding the explicit type `String`
-   |
-LL |     let _: String = String::from("x");
-   |          ^^^^^^^^
 
 error[E0283]: type annotations needed
   --> $DIR/issue-72690.rs:47:5
@@ -74,10 +72,6 @@ LL |     String::from("x".as_ref());
    |
    = note: cannot satisfy `String: From<&_>`
    = note: required by `from`
-help: consider giving this binding the explicit type `String`
-   |
-LL |     let _: String = String::from("x");
-   |          ^^^^^^^^
 
 error[E0283]: type annotations needed
   --> $DIR/issue-72690.rs:55:5
@@ -87,10 +81,6 @@ LL |     String::from("x".as_ref());
    |
    = note: cannot satisfy `String: From<&_>`
    = note: required by `from`
-help: consider giving this binding the explicit type `String`
-   |
-LL |     let _: String = String::from("x");
-   |          ^^^^^^^^
 
 error: aborting due to 9 previous errors
 

src/test/ui/traits/issue-77982.stderr

@@ -23,21 +23,27 @@ error[E0283]: type annotations needed for `Box<T>`
   --> $DIR/issue-77982.rs:35:16
    |
 LL |     let _ = ().foo();
-   |         -      ^^^ cannot infer type for type parameter `T` declared on the trait `Foo`
-   |         |
-   |         consider giving this pattern the explicit type `Box<T>`, where the type parameter `T` is specified
+   |                ^^^ cannot infer type for type parameter `T` declared on the trait `Foo`
    |
    = note: cannot satisfy `(): Foo<'_, _>`
+help: consider giving this binding the explicit type `Box<T>`, where the type parameter `T` is specified
+   |
+LL |     let _: () = ().foo();
+   |          ^^^^
 
 error[E0283]: type annotations needed for `Box<T>`
   --> $DIR/issue-77982.rs:39:19
    |
 LL |     let _ = (&()).bar();
-   |         -         ^^^ cannot infer type for type parameter `T` declared on the trait `Bar`
-   |         |
-   |         consider giving this pattern the explicit type `Box<T>`, where the type parameter `T` is specified
+   |                   ^^^ cannot infer type for type parameter `T` declared on the trait `Bar`
    |
    = note: cannot satisfy `&(): Bar<'_, _>`
+help: consider giving this binding the explicit type `Box<T>`, where the type parameter `T` is specified
+   |
+LL |     let _: &'a () = (&()).bar();
+   |          ^^^^^^^^
+LL |     let _: &'a () = (&()).bar();
+   |          ^^^^^^^^
 
 error: aborting due to 4 previous errors