Update some UI tests

src/test/ui/impl-trait/trait_type.stderr

@@ -16,23 +16,23 @@ error[E0050]: method `fmt` has 1 parameter but the declaration in trait `std::fm
 LL |    fn fmt(&self) -> () { }
    |           ^^^^^ expected 2 parameters, found 1
    |
-   = note: `fmt` from trait: `fn(&Self, &mut Formatter<'_>) -> Result<(), std::fmt::Error>`
+   = note: `fmt` from trait: `fn(&Self, &mut Formatter<'_>) -> std::fmt::Result`
 
 error[E0186]: method `fmt` has a `&self` declaration in the trait, but not in the impl
   --> $DIR/trait_type.rs:17:4
    |
 LL |    fn fmt() -> () { }
    |    ^^^^^^^^^^^^^^ expected `&self` in impl
    |
-   = note: `fmt` from trait: `fn(&Self, &mut Formatter<'_>) -> Result<(), std::fmt::Error>`
+   = note: `fmt` from trait: `fn(&Self, &mut Formatter<'_>) -> std::fmt::Result`
 
 error[E0046]: not all trait items implemented, missing: `fmt`
   --> $DIR/trait_type.rs:21:1
    |
 LL | impl std::fmt::Display for MyType4 {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `fmt` in implementation
    |
-   = help: implement the missing item: `fn fmt(&self, _: &mut Formatter<'_>) -> Result<(), std::fmt::Error> { todo!() }`
+   = help: implement the missing item: `fn fmt(&self, _: &mut Formatter<'_>) -> std::fmt::Result { todo!() }`
 
 error: aborting due to 4 previous errors
 

src/test/ui/nll/type-alias-free-regions.stderr

@@ -4,7 +4,7 @@ error: lifetime may not live long enough
 LL | impl<'a> FromBox<'a> for C<'a> {
    |      -- lifetime `'a` defined here
 LL |     fn from_box(b: Box<B>) -> Self {
-   |                 - has type `Box<Box<&'1 isize>>`
+   |                 - has type `Box<B<'1>>`
 LL |         C { f: b }
    |         ^^^^^^^^^^ associated function was supposed to return data with lifetime `'a` but it is returning data with lifetime `'1`
 
@@ -14,7 +14,7 @@ error: lifetime may not live long enough
 LL | impl<'a> FromTuple<'a> for C<'a> {
    |      -- lifetime `'a` defined here
 LL |     fn from_tuple(b: (B,)) -> Self {
-   |                   - has type `(Box<&'1 isize>,)`
+   |                   - has type `(B<'1>,)`
 LL |         C { f: Box::new(b.0) }
    |         ^^^^^^^^^^^^^^^^^^^^^^ associated function was supposed to return data with lifetime `'a` but it is returning data with lifetime `'1`
 

src/test/ui/privacy/private-in-public-warn.rs

@@ -247,7 +247,7 @@ mod aliases_priv {
         //~^ ERROR private trait `PrivTr1` in public interface
         //~| WARNING hard error
     pub trait Tr2: PrivUseAliasTr<PrivAlias> {}
-        //~^ ERROR private trait `PrivTr1<Priv2>` in public interface
+        //~^ ERROR private trait `PrivTr1<aliases_priv::PrivAlias>` in public interface
         //~| WARNING hard error
         //~| ERROR private type `Priv2` in public interface
         //~| WARNING hard error

src/test/ui/privacy/private-in-public-warn.stderr

@@ -291,7 +291,7 @@ LL |     pub trait Tr1: PrivUseAliasTr {}
    = 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 #34537 <https://github.com/rust-lang/rust/issues/34537>
 
-error: private trait `PrivTr1<Priv2>` in public interface (error E0445)
+error: private trait `PrivTr1<aliases_priv::PrivAlias>` in public interface (error E0445)
   --> $DIR/private-in-public-warn.rs:249:5
    |
 LL |     pub trait Tr2: PrivUseAliasTr<PrivAlias> {}

src/test/ui/regions/regions-infer-paramd-indirect.stderr

@@ -5,7 +5,7 @@ LL | impl<'a> SetF<'a> for C<'a> {
    |      -- lifetime `'a` defined here
 ...
 LL |     fn set_f_bad(&mut self, b: Box<B>) {
-   |                             - has type `Box<Box<&'1 isize>>`
+   |                             - has type `Box<B<'1>>`
 LL |         self.f = b;
    |         ^^^^^^ assignment requires that `'1` must outlive `'a`
 

src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch.stderr

@@ -30,7 +30,7 @@ error: lifetime may not live long enough
   --> $DIR/arbitrary_self_types_pin_lifetime_mismatch.rs:15:58
    |
 LL |     fn bar<'a>(self: Alias<&Self>, arg: &'a ()) -> &() { arg }
-   |            --  ---- has type `Pin<&'1 Foo>`              ^^^ associated function was supposed to return data with lifetime `'1` but it is returning data with lifetime `'a`
+   |            --  ---- has type `Alias<&'1 Foo>`            ^^^ associated function was supposed to return data with lifetime `'1` but it is returning data with lifetime `'a`
    |            |
    |            lifetime `'a` defined here
 

src/test/ui/span/impl-wrong-item-for-trait.stderr

@@ -58,7 +58,7 @@ error[E0046]: not all trait items implemented, missing: `fmt`
 LL | impl Debug for FooTypeForMethod {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `fmt` in implementation
    |
-   = help: implement the missing item: `fn fmt(&self, _: &mut Formatter<'_>) -> Result<(), std::fmt::Error> { todo!() }`
+   = help: implement the missing item: `fn fmt(&self, _: &mut Formatter<'_>) -> std::fmt::Result { todo!() }`
 
 error: aborting due to 7 previous errors