Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 27 insertions, 0 deletions

diff --git a/tests/ui/nll/normalization-bounds-error.stderr b/tests/ui/nll/normalization-bounds-error.stderr
new file mode 100644
index 000000000..0fc3670d6
--- /dev/null
+++ b/tests/ui/nll/normalization-bounds-error.stderr
@@ -0,0 +1,27 @@
+error[E0495]: cannot infer an appropriate lifetime for lifetime parameter `'d` due to conflicting requirements
+  --> $DIR/normalization-bounds-error.rs:12:31
+   |
+LL | fn visit_seq<'d, 'a: 'd>() -> <&'a () as Visitor<'d>>::Value {}
+   |                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+note: first, the lifetime cannot outlive the lifetime `'d` as defined here...
+  --> $DIR/normalization-bounds-error.rs:12:14
+   |
+LL | fn visit_seq<'d, 'a: 'd>() -> <&'a () as Visitor<'d>>::Value {}
+   |              ^^
+note: ...but the lifetime must also be valid for the lifetime `'a` as defined here...
+  --> $DIR/normalization-bounds-error.rs:12:18
+   |
+LL | fn visit_seq<'d, 'a: 'd>() -> <&'a () as Visitor<'d>>::Value {}
+   |                  ^^
+note: ...so that the types are compatible
+  --> $DIR/normalization-bounds-error.rs:12:31
+   |
+LL | fn visit_seq<'d, 'a: 'd>() -> <&'a () as Visitor<'d>>::Value {}
+   |                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: expected `Visitor<'d>`
+              found `Visitor<'_>`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0495`.