Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 15 insertions, 0 deletions

diff --git a/tests/ui/underscore-lifetime/in-fn-return-illegal.stderr b/tests/ui/underscore-lifetime/in-fn-return-illegal.stderr
new file mode 100644
index 000000000..6a104e8f9
--- /dev/null
+++ b/tests/ui/underscore-lifetime/in-fn-return-illegal.stderr
@@ -0,0 +1,15 @@
+error[E0106]: missing lifetime specifier
+  --> $DIR/in-fn-return-illegal.rs:5:30
+   |
+LL | fn foo(x: &u32, y: &u32) -> &'_ u32 { loop { } }
+   |           ----     ----      ^^ expected named lifetime parameter
+   |
+   = help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from `x` or `y`
+help: consider introducing a named lifetime parameter
+   |
+LL | fn foo<'a>(x: &'a u32, y: &'a u32) -> &'a u32 { loop { } }
+   |       ++++     ++          ++          ~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0106`.