Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 104 deletions

diff --git a/src/test/ui/closures/2229_closure_analysis/diagnostics/arrays.stderr b/src/test/ui/closures/2229_closure_analysis/diagnostics/arrays.stderr
deleted file mode 100644
index 4f41060dc..000000000
--- a/src/test/ui/closures/2229_closure_analysis/diagnostics/arrays.stderr
+++ /dev/null
@@ -1,104 +0,0 @@
-error[E0503]: cannot use `arr` because it was mutably borrowed
-  --> $DIR/arrays.rs:14:5
-   |
-LL |     let mut c = || {
-   |                 -- borrow of `arr` occurs here
-LL |         arr[0] += 10;
-   |         --- borrow occurs due to use of `arr` in closure
-...
-LL |     arr[1] += 10;
-   |     ^^^^^^ use of borrowed `arr`
-...
-LL |     c();
-   |     - borrow later used here
-
-error[E0503]: cannot use `arr[_]` because it was mutably borrowed
-  --> $DIR/arrays.rs:14:5
-   |
-LL |     let mut c = || {
-   |                 -- borrow of `arr` occurs here
-LL |         arr[0] += 10;
-   |         --- borrow occurs due to use of `arr` in closure
-...
-LL |     arr[1] += 10;
-   |     ^^^^^^^^^^^^ use of borrowed `arr`
-...
-LL |     c();
-   |     - borrow later used here
-
-error[E0506]: cannot assign to `arr[_]` because it is borrowed
-  --> $DIR/arrays.rs:29:5
-   |
-LL |     let c = || {
-   |             -- borrow of `arr[_]` occurs here
-LL |         println!("{:#?}", &arr[3..4]);
-   |                            --- borrow occurs due to use in closure
-...
-LL |     arr[1] += 10;
-   |     ^^^^^^^^^^^^ assignment to borrowed `arr[_]` occurs here
-LL |
-LL |     c();
-   |     - borrow later used here
-
-error[E0506]: cannot assign to `arr[_]` because it is borrowed
-  --> $DIR/arrays.rs:43:5
-   |
-LL |     let c = || {
-   |             -- borrow of `arr[_]` occurs here
-LL |         println!("{}", arr[3]);
-   |                        --- borrow occurs due to use in closure
-...
-LL |     arr[1] += 10;
-   |     ^^^^^^^^^^^^ assignment to borrowed `arr[_]` occurs here
-LL |
-LL |     c();
-   |     - borrow later used here
-
-error[E0503]: cannot use `arr` because it was mutably borrowed
-  --> $DIR/arrays.rs:57:20
-   |
-LL |     let mut c = || {
-   |                 -- borrow of `arr` occurs here
-LL |         arr[1] += 10;
-   |         --- borrow occurs due to use of `arr` in closure
-...
-LL |     println!("{}", arr[3]);
-   |                    ^^^^^^ use of borrowed `arr`
-...
-LL |     c();
-   |     - borrow later used here
-
-error[E0502]: cannot borrow `arr[_]` as immutable because it is also borrowed as mutable
-  --> $DIR/arrays.rs:57:20
-   |
-LL |     let mut c = || {
-   |                 -- mutable borrow occurs here
-LL |         arr[1] += 10;
-   |         --- first borrow occurs due to use of `arr` in closure
-...
-LL |     println!("{}", arr[3]);
-   |                    ^^^^^^ immutable borrow occurs here
-...
-LL |     c();
-   |     - mutable borrow later used here
-   |
-   = note: this error originates in the macro `$crate::format_args_nl` which comes from the expansion of the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0502]: cannot borrow `arr` as immutable because it is also borrowed as mutable
-  --> $DIR/arrays.rs:73:24
-   |
-LL |     let mut c = || {
-   |                 -- mutable borrow occurs here
-LL |         arr[1] += 10;
-   |         --- first borrow occurs due to use of `arr` in closure
-...
-LL |     println!("{:#?}", &arr[3..2]);
-   |                        ^^^ immutable borrow occurs here
-...
-LL |     c();
-   |     - mutable borrow later used here
-
-error: aborting due to 7 previous errors
-
-Some errors have detailed explanations: E0502, E0503, E0506.
-For more information about an error, try `rustc --explain E0502`.