Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 17 deletions

diff --git a/src/test/ui/nll/issue-45157.stderr b/src/test/ui/nll/issue-45157.stderr
deleted file mode 100644
index 57fd8d49c..000000000
--- a/src/test/ui/nll/issue-45157.stderr
+++ /dev/null
@@ -1,17 +0,0 @@
-error[E0502]: cannot borrow `u` (via `u.z.c`) as immutable because it is also borrowed as mutable (via `u.s.a`)
-  --> $DIR/issue-45157.rs:27:20
-   |
-LL |         let mref = &mut u.s.a;
-   |                    ---------- mutable borrow occurs here (via `u.s.a`)
-...
-LL |         let nref = &u.z.c;
-   |                    ^^^^^^ immutable borrow of `u.z.c` -- which overlaps with `u.s.a` -- occurs here
-LL |
-LL |         println!("{} {}", mref, nref)
-   |                           ---- mutable borrow later used here
-   |
-   = note: `u.z.c` is a field of the union `U`, so it overlaps the field `u.s.a`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0502`.