diff options
9 files changed, 34 insertions, 34 deletions
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 index 86712a726dd..636904aefb4 100644 --- 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 index 0fdf2e8b20e..474eadb7f92 100644 --- 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 index 27bef1d7331..68893781dc2 100644 --- 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 index 1fc526ed3ae..64a57469510 100644 --- 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 index 47531dded07..5764ab03c55 100644 --- 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 index b16bde55dc7..416719a08e0 100644 --- 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 index 288203f674b..6ca9ab1b2c7 100644 --- 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 index 3c4abdcd67d..955222f7655 100644 --- 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 index eee073d7a14..c80993fe8c4 100644 --- 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 { | ++++ ++ ++ |