update (bless) test results

kckeiks · kckeiks · commit 1b08cba310c6 · 2022-03-01T13:07:53.000-05:00
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.stderr
@@ -9,7 +9,7 @@ LL |     x
    |     ^ ...but data from `x` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |   fn foo<'a>(&'a self, x: &'a i32) -> &i32 {
    |               ++           ++
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.stderr
@@ -9,7 +9,7 @@ LL |         if true { x } else { self }
    |                   ^ ...but data from `x` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn foo<'a>(&'a self, x: &'a Foo) -> &Foo {
    |                 ++           ++
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-impl-items.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-impl-items.stderr
@@ -7,7 +7,7 @@ LL |         x.push(y);
    |                ^ ...but data from `y` flows into `x` here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn foo<'a>(x: &mut Vec<&'a u8>, y: &'a u8) {
    |           ++++              ++          ++
diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch.stderr b/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch.stderr
@@ -7,7 +7,7 @@ LL |     fn a(self: Pin<&Foo>, f: &Foo) -> &Foo { f }
    |                              this parameter and the return type are declared with different lifetimes...
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn a<'a>(self: Pin<&'a Foo>, f: &'a Foo) -> &Foo { f }
    |         ++++            ++           ++
@@ -21,7 +21,7 @@ LL |     fn c(self: Pin<&Self>, f: &Foo, g: &Foo) -> (Pin<&Foo>, &Foo) { (self,
    |                               this parameter and the return type are declared with different lifetimes...
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn c<'a>(self: Pin<&'a Self>, f: &'a Foo, g: &Foo) -> (Pin<&Foo>, &Foo) { (self, f) }
    |         ++++            ++            ++
diff --git a/src/test/ui/self/elision/lt-ref-self.stderr b/src/test/ui/self/elision/lt-ref-self.stderr
@@ -9,7 +9,7 @@ LL |         f
    |         ^ ...but data from `f` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn ref_self<'a>(&'a self, f: &'a u32) -> &u32 {
    |                ++++  ++           ++
@@ -25,7 +25,7 @@ LL |         f
    |         ^ ...but data from `f` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn ref_Self<'a>(self: &'a Self, f: &'a u32) -> &u32 {
    |                ++++        ++           ++
@@ -41,7 +41,7 @@ LL |         f
    |         ^ ...but data from `f` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn box_ref_Self<'a>(self: Box<&'a Self>, f: &'a u32) -> &u32 {
    |                    ++++            ++            ++
@@ -57,7 +57,7 @@ LL |         f
    |         ^ ...but data from `f` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn pin_ref_Self<'a>(self: Pin<&'a Self>, f: &'a u32) -> &u32 {
    |                    ++++            ++            ++
@@ -73,7 +73,7 @@ LL |         f
    |         ^ ...but data from `f` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn box_box_ref_Self<'a>(self: Box<Box<&'a Self>>, f: &'a u32) -> &u32 {
    |                        ++++                ++             ++
@@ -89,7 +89,7 @@ LL |         f
    |         ^ ...but data from `f` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn box_pin_Self<'a>(self: Box<Pin<&'a Self>>, f: &'a u32) -> &u32 {
    |                    ++++                ++             ++
diff --git a/src/test/ui/self/elision/ref-mut-self.stderr b/src/test/ui/self/elision/ref-mut-self.stderr
@@ -9,7 +9,7 @@ LL |         f
    |         ^ ...but data from `f` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn ref_self<'a>(&'a mut self, f: &'a u32) -> &u32 {
    |                ++++  ++               ++
@@ -25,7 +25,7 @@ LL |         f
    |         ^ ...but data from `f` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn ref_Self<'a>(self: &'a mut Self, f: &'a u32) -> &u32 {
    |                ++++        ++               ++
@@ -41,7 +41,7 @@ LL |         f
    |         ^ ...but data from `f` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn box_ref_Self<'a>(self: Box<&'a mut Self>, f: &'a u32) -> &u32 {
    |                    ++++            ++                ++
@@ -57,7 +57,7 @@ LL |         f
    |         ^ ...but data from `f` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn pin_ref_Self<'a>(self: Pin<&'a mut Self>, f: &'a u32) -> &u32 {
    |                    ++++            ++                ++
@@ -73,7 +73,7 @@ LL |         f
    |         ^ ...but data from `f` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn box_box_ref_Self<'a>(self: Box<Box<&'a mut Self>>, f: &'a u32) -> &u32 {
    |                        ++++                ++                 ++
@@ -89,7 +89,7 @@ LL |         f
    |         ^ ...but data from `f` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn box_pin_ref_Self<'a>(self: Box<Pin<&'a mut Self>>, f: &'a u32) -> &u32 {
    |                        ++++                ++                 ++
diff --git a/src/test/ui/self/elision/ref-mut-struct.stderr b/src/test/ui/self/elision/ref-mut-struct.stderr
@@ -9,7 +9,7 @@ LL |         f
    |         ^ ...but data from `f` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn ref_Struct<'a>(self: &'a mut Struct, f: &'a u32) -> &u32 {
    |                  ++++        ++                 ++
@@ -25,7 +25,7 @@ LL |         f
    |         ^ ...but data from `f` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn box_ref_Struct<'a>(self: Box<&'a mut Struct>, f: &'a u32) -> &u32 {
    |                      ++++            ++                  ++
@@ -41,7 +41,7 @@ LL |         f
    |         ^ ...but data from `f` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn pin_ref_Struct<'a>(self: Pin<&'a mut Struct>, f: &'a u32) -> &u32 {
    |                      ++++            ++                  ++
@@ -57,7 +57,7 @@ LL |         f
    |         ^ ...but data from `f` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn box_box_ref_Struct<'a>(self: Box<Box<&'a mut Struct>>, f: &'a u32) -> &u32 {
    |                          ++++                ++                   ++
@@ -73,7 +73,7 @@ LL |         f
    |         ^ ...but data from `f` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn box_pin_ref_Struct<'a>(self: Box<Pin<&'a mut Struct>>, f: &'a u32) -> &u32 {
    |                          ++++                ++                   ++
diff --git a/src/test/ui/self/elision/ref-self.stderr b/src/test/ui/self/elision/ref-self.stderr
@@ -9,7 +9,7 @@ LL |         f
    |         ^ ...but data from `f` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn ref_self<'a>(&'a self, f: &'a u32) -> &u32 {
    |                ++++  ++           ++
@@ -25,7 +25,7 @@ LL |         f
    |         ^ ...but data from `f` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn ref_Self<'a>(self: &'a Self, f: &'a u32) -> &u32 {
    |                ++++        ++           ++
@@ -41,7 +41,7 @@ LL |         f
    |         ^ ...but data from `f` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn box_ref_Self<'a>(self: Box<&'a Self>, f: &'a u32) -> &u32 {
    |                    ++++            ++            ++
@@ -57,7 +57,7 @@ LL |         f
    |         ^ ...but data from `f` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn pin_ref_Self<'a>(self: Pin<&'a Self>, f: &'a u32) -> &u32 {
    |                    ++++            ++            ++
@@ -73,7 +73,7 @@ LL |         f
    |         ^ ...but data from `f` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn box_box_ref_Self<'a>(self: Box<Box<&'a Self>>, f: &'a u32) -> &u32 {
    |                        ++++                ++             ++
@@ -89,7 +89,7 @@ LL |         f
    |         ^ ...but data from `f` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn box_pin_ref_Self<'a>(self: Box<Pin<&'a Self>>, f: &'a u32) -> &u32 {
    |                        ++++                ++             ++
@@ -105,7 +105,7 @@ LL |         f
    |         ^ ...but data from `f` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn wrap_ref_Self_Self<'a>(self: Wrap<&'a Self, Self>, f: &'a u8) -> &u8 {
    |                          ++++             ++                  ++
diff --git a/src/test/ui/self/elision/ref-struct.stderr b/src/test/ui/self/elision/ref-struct.stderr
@@ -9,7 +9,7 @@ LL |         f
    |         ^ ...but data from `f` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn ref_Struct<'a>(self: &'a Struct, f: &'a u32) -> &u32 {
    |                  ++++        ++             ++
@@ -25,7 +25,7 @@ LL |         f
    |         ^ ...but data from `f` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn box_ref_Struct<'a>(self: Box<&'a Struct>, f: &'a u32) -> &u32 {
    |                      ++++            ++              ++
@@ -41,7 +41,7 @@ LL |         f
    |         ^ ...but data from `f` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn pin_ref_Struct<'a>(self: Pin<&'a Struct>, f: &'a u32) -> &u32 {
    |                      ++++            ++              ++
@@ -57,7 +57,7 @@ LL |         f
    |         ^ ...but data from `f` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn box_box_ref_Struct<'a>(self: Box<Box<&'a Struct>>, f: &'a u32) -> &u32 {
    |                          ++++                ++               ++
@@ -73,7 +73,7 @@ LL |         f
    |         ^ ...but data from `f` is returned here
    |
    = note: each elided lifetime in input position becomes a distinct lifetime
-help: consider introducing a named lifetime parameter
+help: consider introducing a named lifetime parameter and update trait if needed
    |
 LL |     fn box_pin_Struct<'a>(self: Box<Pin<&'a Struct>>, f: &'a u32) -> &u32 {
    |                      ++++                ++               ++

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ LL \| x`
`9`	`9`	\| ^ ...but data from `x` is returned here
`10`	`10`	`\|`
`11`	`11`	`= note: each elided lifetime in input position becomes a distinct lifetime`
`12`		`-help: consider introducing a named lifetime parameter`
	`12`	`+help: consider introducing a named lifetime parameter and update trait if needed`
`13`	`13`	`\|`
`14`	`14`	`LL \| fn foo<'a>(&'a self, x: &'a i32) -> &i32 {`
`15`	`15`	`\| ++ ++`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ LL \| if true { x } else { self }`
`9`	`9`	\| ^ ...but data from `x` is returned here
`10`	`10`	`\|`
`11`	`11`	`= note: each elided lifetime in input position becomes a distinct lifetime`
`12`		`-help: consider introducing a named lifetime parameter`
	`12`	`+help: consider introducing a named lifetime parameter and update trait if needed`
`13`	`13`	`\|`
`14`	`14`	`LL \| fn foo<'a>(&'a self, x: &'a Foo) -> &Foo {`
`15`	`15`	`\| ++ ++`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| x.push(y);`
`7`	`7`	\| ^ ...but data from `y` flows into `x` here
`8`	`8`	`\|`
`9`	`9`	`= note: each elided lifetime in input position becomes a distinct lifetime`
`10`		`-help: consider introducing a named lifetime parameter`
	`10`	`+help: consider introducing a named lifetime parameter and update trait if needed`
`11`	`11`	`\|`
`12`	`12`	`LL \| fn foo<'a>(x: &mut Vec<&'a u8>, y: &'a u8) {`
`13`	`13`	`\| ++++ ++ ++`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| fn a(self: Pin<&Foo>, f: &Foo) -> &Foo { f }`
`7`	`7`	`\| this parameter and the return type are declared with different lifetimes...`
`8`	`8`	`\|`
`9`	`9`	`= note: each elided lifetime in input position becomes a distinct lifetime`
`10`		`-help: consider introducing a named lifetime parameter`
	`10`	`+help: consider introducing a named lifetime parameter and update trait if needed`
`11`	`11`	`\|`
`12`	`12`	`LL \| fn a<'a>(self: Pin<&'a Foo>, f: &'a Foo) -> &Foo { f }`
`13`	`13`	`\| ++++ ++ ++`
`@@ -21,7 +21,7 @@ LL \| fn c(self: Pin<&Self>, f: &Foo, g: &Foo) -> (Pin<&Foo>, &Foo) { (self,`
`21`	`21`	`\| this parameter and the return type are declared with different lifetimes...`
`22`	`22`	`\|`
`23`	`23`	`= note: each elided lifetime in input position becomes a distinct lifetime`
`24`		`-help: consider introducing a named lifetime parameter`
	`24`	`+help: consider introducing a named lifetime parameter and update trait if needed`
`25`	`25`	`\|`
`26`	`26`	`LL \| fn c<'a>(self: Pin<&'a Self>, f: &'a Foo, g: &Foo) -> (Pin<&Foo>, &Foo) { (self, f) }`
`27`	`27`	`\| ++++ ++ ++`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ LL \| f`
`9`	`9`	\| ^ ...but data from `f` is returned here
`10`	`10`	`\|`
`11`	`11`	`= note: each elided lifetime in input position becomes a distinct lifetime`
`12`		`-help: consider introducing a named lifetime parameter`
	`12`	`+help: consider introducing a named lifetime parameter and update trait if needed`
`13`	`13`	`\|`
`14`	`14`	`LL \| fn ref_self<'a>(&'a self, f: &'a u32) -> &u32 {`
`15`	`15`	`\| ++++ ++ ++`
`@@ -25,7 +25,7 @@ LL \| f`
`25`	`25`	\| ^ ...but data from `f` is returned here
`26`	`26`	`\|`
`27`	`27`	`= note: each elided lifetime in input position becomes a distinct lifetime`
`28`		`-help: consider introducing a named lifetime parameter`
	`28`	`+help: consider introducing a named lifetime parameter and update trait if needed`
`29`	`29`	`\|`
`30`	`30`	`LL \| fn ref_Self<'a>(self: &'a Self, f: &'a u32) -> &u32 {`
`31`	`31`	`\| ++++ ++ ++`
`@@ -41,7 +41,7 @@ LL \| f`
`41`	`41`	\| ^ ...but data from `f` is returned here
`42`	`42`	`\|`
`43`	`43`	`= note: each elided lifetime in input position becomes a distinct lifetime`
`44`		`-help: consider introducing a named lifetime parameter`
	`44`	`+help: consider introducing a named lifetime parameter and update trait if needed`
`45`	`45`	`\|`
`46`	`46`	`LL \| fn box_ref_Self<'a>(self: Box<&'a Self>, f: &'a u32) -> &u32 {`
`47`	`47`	`\| ++++ ++ ++`
`@@ -57,7 +57,7 @@ LL \| f`
`57`	`57`	\| ^ ...but data from `f` is returned here
`58`	`58`	`\|`
`59`	`59`	`= note: each elided lifetime in input position becomes a distinct lifetime`
`60`		`-help: consider introducing a named lifetime parameter`
	`60`	`+help: consider introducing a named lifetime parameter and update trait if needed`
`61`	`61`	`\|`
`62`	`62`	`LL \| fn pin_ref_Self<'a>(self: Pin<&'a Self>, f: &'a u32) -> &u32 {`
`63`	`63`	`\| ++++ ++ ++`
`@@ -73,7 +73,7 @@ LL \| f`
`73`	`73`	\| ^ ...but data from `f` is returned here
`74`	`74`	`\|`
`75`	`75`	`= note: each elided lifetime in input position becomes a distinct lifetime`
`76`		`-help: consider introducing a named lifetime parameter`
	`76`	`+help: consider introducing a named lifetime parameter and update trait if needed`
`77`	`77`	`\|`
`78`	`78`	`LL \| fn box_box_ref_Self<'a>(self: Box<Box<&'a Self>>, f: &'a u32) -> &u32 {`
`79`	`79`	`\| ++++ ++ ++`
`@@ -89,7 +89,7 @@ LL \| f`
`89`	`89`	\| ^ ...but data from `f` is returned here
`90`	`90`	`\|`
`91`	`91`	`= note: each elided lifetime in input position becomes a distinct lifetime`
`92`		`-help: consider introducing a named lifetime parameter`
	`92`	`+help: consider introducing a named lifetime parameter and update trait if needed`
`93`	`93`	`\|`
`94`	`94`	`LL \| fn box_pin_Self<'a>(self: Box<Pin<&'a Self>>, f: &'a u32) -> &u32 {`
`95`	`95`	`\| ++++ ++ ++`