Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 42 deletions

diff --git a/src/test/ui/where-clauses/where-lifetime-resolution.stderr b/src/test/ui/where-clauses/where-lifetime-resolution.stderr
deleted file mode 100644
index e8df02fba..000000000
--- a/src/test/ui/where-clauses/where-lifetime-resolution.stderr
+++ /dev/null
@@ -1,42 +0,0 @@
-error[E0261]: use of undeclared lifetime name `'a`
-  --> $DIR/where-lifetime-resolution.rs:6:38
-   |
-LL |     (dyn for<'a> Trait1<'a>): Trait1<'a>,
-   |                                      ^^ undeclared lifetime
-   |
-   = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html
-help: consider making the bound lifetime-generic with a new `'a` lifetime
-   |
-LL |     (dyn for<'a> Trait1<'a>): for<'a> Trait1<'a>,
-   |                               +++++++
-help: consider making the bound lifetime-generic with a new `'a` lifetime
-   |
-LL |     for<'a> (dyn for<'a> Trait1<'a>): Trait1<'a>,
-   |     +++++++
-help: consider introducing lifetime `'a` here
-   |
-LL | fn f<'a>() where
-   |     ++++
-
-error[E0261]: use of undeclared lifetime name `'b`
-  --> $DIR/where-lifetime-resolution.rs:8:52
-   |
-LL |     for<'a> dyn for<'b> Trait2<'a, 'b>: Trait2<'a, 'b>,
-   |                                                    ^^ undeclared lifetime
-   |
-help: consider making the bound lifetime-generic with a new `'b` lifetime
-   |
-LL |     for<'a> dyn for<'b> Trait2<'a, 'b>: for<'b> Trait2<'a, 'b>,
-   |                                         +++++++
-help: consider making the bound lifetime-generic with a new `'b` lifetime
-   |
-LL |     for<'b, 'a> dyn for<'b> Trait2<'a, 'b>: Trait2<'a, 'b>,
-   |         +++
-help: consider introducing lifetime `'b` here
-   |
-LL | fn f<'b>() where
-   |     ++++
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0261`.