Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 46 deletions

diff --git a/src/test/ui/nll/user-annotations/method-ufcs-2.stderr b/src/test/ui/nll/user-annotations/method-ufcs-2.stderr
deleted file mode 100644
index 63d59905e..000000000
--- a/src/test/ui/nll/user-annotations/method-ufcs-2.stderr
+++ /dev/null
@@ -1,46 +0,0 @@
-error[E0597]: `a` does not live long enough
-  --> $DIR/method-ufcs-2.rs:30:7
-   |
-LL |     x(&a, b, c);
-   |     --^^-------
-   |     | |
-   |     | borrowed value does not live long enough
-   |     argument requires that `a` is borrowed for `'static`
-LL | }
-   | - `a` dropped here while still borrowed
-
-error[E0597]: `b` does not live long enough
-  --> $DIR/method-ufcs-2.rs:37:39
-   |
-LL | fn annot_reference_named_lifetime<'a>(_d: &'a u32) {
-   |                                   -- lifetime `'a` defined here
-...
-LL |     <_ as Bazoom<&'a u32>>::method(a, &b, c);
-   |     ----------------------------------^^----
-   |     |                                 |
-   |     |                                 borrowed value does not live long enough
-   |     argument requires that `b` is borrowed for `'a`
-LL | }
-   | - `b` dropped here while still borrowed
-
-error[E0597]: `b` does not live long enough
-  --> $DIR/method-ufcs-2.rs:51:44
-   |
-LL | fn annot_reference_named_lifetime_in_closure<'a>(_: &'a u32) {
-   |                                              -- lifetime `'a` defined here
-...
-LL |     let _closure = || {
-   |                    -- value captured here
-LL |         let c = 66;
-LL |         <_ as Bazoom<&'a u32>>::method(a, &b, c);
-   |         -----------------------------------^----
-   |         |                                  |
-   |         |                                  borrowed value does not live long enough
-   |         argument requires that `b` is borrowed for `'a`
-LL |     };
-LL | }
-   | - `b` dropped here while still borrowed
-
-error: aborting due to 3 previous errors
-
-For more information about this error, try `rustc --explain E0597`.