Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 26 insertions, 0 deletions

diff --git a/tests/ui/nll/outlives-suggestion-more.rs b/tests/ui/nll/outlives-suggestion-more.rs
new file mode 100644
index 000000000..2e1359fe5
--- /dev/null
+++ b/tests/ui/nll/outlives-suggestion-more.rs
@@ -0,0 +1,26 @@
+// Test the more elaborate outlives suggestions.
+
+// Should suggest: 'a: 'c, 'b: 'd
+fn foo1<'a, 'b, 'c, 'd>(x: &'a usize, y: &'b usize) -> (&'c usize, &'d usize) {
+    (x, y) //~ERROR lifetime may not live long enough
+           //~^ERROR lifetime may not live long enough
+}
+
+// Should suggest: 'a: 'c and use 'static instead of 'b
+fn foo2<'a, 'b, 'c>(x: &'a usize, y: &'b usize) -> (&'c usize, &'static usize) {
+    (x, y) //~ERROR lifetime may not live long enough
+           //~^ERROR lifetime may not live long enough
+}
+
+// Should suggest: 'a and 'b are the same and use 'static instead of 'c
+fn foo3<'a, 'b, 'c, 'd, 'e>(
+    x: &'a usize,
+    y: &'b usize,
+    z: &'c usize,
+) -> (&'b usize, &'a usize, &'static usize) {
+    (x, y, z) //~ERROR lifetime may not live long enough
+              //~^ERROR lifetime may not live long enough
+              //~^^ERROR lifetime may not live long enough
+}
+
+fn main() {}