Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 35 deletions

diff --git a/src/test/ui/nll/closure-requirements/escape-argument.stderr b/src/test/ui/nll/closure-requirements/escape-argument.stderr
deleted file mode 100644
index f67c312b9..000000000
--- a/src/test/ui/nll/closure-requirements/escape-argument.stderr
+++ /dev/null
@@ -1,35 +0,0 @@
-note: no external requirements
-  --> $DIR/escape-argument.rs:26:38
-   |
-LL |         let mut closure = expect_sig(|p, y| *p = y);
-   |                                      ^^^^^^
-   |
-   = note: defining type: test::{closure#0} with closure substs [
-               i16,
-               for<Region(BrAnon(0, None)), Region(BrAnon(1, None))> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BoundRegion { var: 0, kind: BrAnon(0, None) }) mut &ReLateBound(DebruijnIndex(0), BoundRegion { var: 1, kind: BrAnon(1, None) }) i32, &ReLateBound(DebruijnIndex(0), BoundRegion { var: 1, kind: BrAnon(1, None) }) i32)),
-               (),
-           ]
-
-note: no external requirements
-  --> $DIR/escape-argument.rs:20:1
-   |
-LL | fn test() {
-   | ^^^^^^^^^
-   |
-   = note: defining type: test
-
-error[E0597]: `y` does not live long enough
-  --> $DIR/escape-argument.rs:27:25
-   |
-LL |         closure(&mut p, &y);
-   |                         ^^ borrowed value does not live long enough
-LL |
-LL |     }
-   |     - `y` dropped here while still borrowed
-LL |
-LL |     deref(p);
-   |           - borrow later used here
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0597`.