Merging upstream version 1.68.2+dfsg1.

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

42 files changed, 30 insertions, 0 deletions

diff --git a/src/test/ui/dropck/auxiliary/dropck_eyepatch_extern_crate.rs b/tests/ui/dropck/auxiliary/dropck_eyepatch_extern_crate.rs
index e07082957..e07082957 100644
--- a/src/test/ui/dropck/auxiliary/dropck_eyepatch_extern_crate.rs
+++ b/tests/ui/dropck/auxiliary/dropck_eyepatch_extern_crate.rs
diff --git a/src/test/ui/dropck/cleanup-arm-conditional.rs b/tests/ui/dropck/cleanup-arm-conditional.rs
index 38c717089..38c717089 100644
--- a/src/test/ui/dropck/cleanup-arm-conditional.rs
+++ b/tests/ui/dropck/cleanup-arm-conditional.rs
diff --git a/src/test/ui/dropck/drop-on-non-struct.rs b/tests/ui/dropck/drop-on-non-struct.rs
index 145eab126..145eab126 100644
--- a/src/test/ui/dropck/drop-on-non-struct.rs
+++ b/tests/ui/dropck/drop-on-non-struct.rs
diff --git a/src/test/ui/dropck/drop-on-non-struct.stderr b/tests/ui/dropck/drop-on-non-struct.stderr
index e8fbe5e97..e8fbe5e97 100644
--- a/src/test/ui/dropck/drop-on-non-struct.stderr
+++ b/tests/ui/dropck/drop-on-non-struct.stderr
diff --git a/src/test/ui/dropck/drop-with-active-borrows-1.rs b/tests/ui/dropck/drop-with-active-borrows-1.rs
index 1e924af29..1e924af29 100644
--- a/src/test/ui/dropck/drop-with-active-borrows-1.rs
+++ b/tests/ui/dropck/drop-with-active-borrows-1.rs
diff --git a/src/test/ui/dropck/drop-with-active-borrows-1.stderr b/tests/ui/dropck/drop-with-active-borrows-1.stderr
index 8d6a7f372..8d6a7f372 100644
--- a/src/test/ui/dropck/drop-with-active-borrows-1.stderr
+++ b/tests/ui/dropck/drop-with-active-borrows-1.stderr
diff --git a/src/test/ui/dropck/drop-with-active-borrows-2.rs b/tests/ui/dropck/drop-with-active-borrows-2.rs
index cf4cb3dbe..cf4cb3dbe 100644
--- a/src/test/ui/dropck/drop-with-active-borrows-2.rs
+++ b/tests/ui/dropck/drop-with-active-borrows-2.rs
diff --git a/src/test/ui/dropck/drop-with-active-borrows-2.stderr b/tests/ui/dropck/drop-with-active-borrows-2.stderr
index 24650dfac..24650dfac 100644
--- a/src/test/ui/dropck/drop-with-active-borrows-2.stderr
+++ b/tests/ui/dropck/drop-with-active-borrows-2.stderr
diff --git a/src/test/ui/dropck/dropck-eyepatch-extern-crate.rs b/tests/ui/dropck/dropck-eyepatch-extern-crate.rs
index b8f303554..b8f303554 100644
--- a/src/test/ui/dropck/dropck-eyepatch-extern-crate.rs
+++ b/tests/ui/dropck/dropck-eyepatch-extern-crate.rs
diff --git a/src/test/ui/dropck/dropck-eyepatch-extern-crate.stderr b/tests/ui/dropck/dropck-eyepatch-extern-crate.stderr
index 5d5340557..5d5340557 100644
--- a/src/test/ui/dropck/dropck-eyepatch-extern-crate.stderr
+++ b/tests/ui/dropck/dropck-eyepatch-extern-crate.stderr
diff --git a/src/test/ui/dropck/dropck-eyepatch-implies-unsafe-impl.rs b/tests/ui/dropck/dropck-eyepatch-implies-unsafe-impl.rs
index 6869ab1c4..6869ab1c4 100644
--- a/src/test/ui/dropck/dropck-eyepatch-implies-unsafe-impl.rs
+++ b/tests/ui/dropck/dropck-eyepatch-implies-unsafe-impl.rs
diff --git a/tests/ui/dropck/dropck-eyepatch-implies-unsafe-impl.stderr b/tests/ui/dropck/dropck-eyepatch-implies-unsafe-impl.stderr
new file mode 100644
index 000000000..5cec2bcb0
--- /dev/null
+++ b/tests/ui/dropck/dropck-eyepatch-implies-unsafe-impl.stderr
@@ -0,0 +1,27 @@
+error[E0569]: requires an `unsafe impl` declaration due to `#[may_dangle]` attribute
+  --> $DIR/dropck-eyepatch-implies-unsafe-impl.rs:21:1
+   |
+LL | impl<#[may_dangle] A, B: fmt::Debug> Drop for Pt<A, B> {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: the trait `Drop` enforces invariants that the compiler can't check. Review the trait documentation and make sure this implementation upholds those invariants before adding the `unsafe` keyword
+help: add `unsafe` to this trait implementation
+   |
+LL | unsafe impl<#[may_dangle] A, B: fmt::Debug> Drop for Pt<A, B> {
+   | ++++++
+
+error[E0569]: requires an `unsafe impl` declaration due to `#[may_dangle]` attribute
+  --> $DIR/dropck-eyepatch-implies-unsafe-impl.rs:27:1
+   |
+LL | impl<#[may_dangle] 'a, 'b, B: fmt::Debug> Drop for Pr<'a, 'b, B> {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: the trait `Drop` enforces invariants that the compiler can't check. Review the trait documentation and make sure this implementation upholds those invariants before adding the `unsafe` keyword
+help: add `unsafe` to this trait implementation
+   |
+LL | unsafe impl<#[may_dangle] 'a, 'b, B: fmt::Debug> Drop for Pr<'a, 'b, B> {
+   | ++++++
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0569`.
diff --git a/src/test/ui/dropck/dropck-eyepatch-reorder.rs b/tests/ui/dropck/dropck-eyepatch-reorder.rs
index 44552b3fc..44552b3fc 100644
--- a/src/test/ui/dropck/dropck-eyepatch-reorder.rs
+++ b/tests/ui/dropck/dropck-eyepatch-reorder.rs
diff --git a/src/test/ui/dropck/dropck-eyepatch-reorder.stderr b/tests/ui/dropck/dropck-eyepatch-reorder.stderr
index 5055cdd8b..5055cdd8b 100644
--- a/src/test/ui/dropck/dropck-eyepatch-reorder.stderr
+++ b/tests/ui/dropck/dropck-eyepatch-reorder.stderr
diff --git a/src/test/ui/dropck/dropck-eyepatch.rs b/tests/ui/dropck/dropck-eyepatch.rs
index ec1c68561..ec1c68561 100644
--- a/src/test/ui/dropck/dropck-eyepatch.rs
+++ b/tests/ui/dropck/dropck-eyepatch.rs
diff --git a/src/test/ui/dropck/dropck-eyepatch.stderr b/tests/ui/dropck/dropck-eyepatch.stderr
index 21295e6c6..21295e6c6 100644
--- a/src/test/ui/dropck/dropck-eyepatch.stderr
+++ b/tests/ui/dropck/dropck-eyepatch.stderr
diff --git a/src/test/ui/dropck/dropck-union.rs b/tests/ui/dropck/dropck-union.rs
index 5a9965db5..5a9965db5 100644
--- a/src/test/ui/dropck/dropck-union.rs
+++ b/tests/ui/dropck/dropck-union.rs
diff --git a/src/test/ui/dropck/dropck-union.stderr b/tests/ui/dropck/dropck-union.stderr
index 854e29385..854e29385 100644
--- a/src/test/ui/dropck/dropck-union.stderr
+++ b/tests/ui/dropck/dropck-union.stderr
diff --git a/src/test/ui/dropck/dropck_fn_type.rs b/tests/ui/dropck/dropck_fn_type.rs
index 2934217df..2934217df 100644
--- a/src/test/ui/dropck/dropck_fn_type.rs
+++ b/tests/ui/dropck/dropck_fn_type.rs
diff --git a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_1.rs b/tests/ui/dropck/dropck_no_diverge_on_nonregular_1.rs
index 43c1c7759..43c1c7759 100644
--- a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_1.rs
+++ b/tests/ui/dropck/dropck_no_diverge_on_nonregular_1.rs
diff --git a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_1.stderr b/tests/ui/dropck/dropck_no_diverge_on_nonregular_1.stderr
index c447e2f79..3e39d15f9 100644
--- a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_1.stderr
+++ b/tests/ui/dropck/dropck_no_diverge_on_nonregular_1.stderr
@@ -8,3 +8,4 @@ LL |     let ft =
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0320`.
diff --git a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_2.rs b/tests/ui/dropck/dropck_no_diverge_on_nonregular_2.rs
index edd07652e..edd07652e 100644
--- a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_2.rs
+++ b/tests/ui/dropck/dropck_no_diverge_on_nonregular_2.rs
diff --git a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_2.stderr b/tests/ui/dropck/dropck_no_diverge_on_nonregular_2.stderr
index cd4706dd9..dbb743544 100644
--- a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_2.stderr
+++ b/tests/ui/dropck/dropck_no_diverge_on_nonregular_2.stderr
@@ -8,3 +8,4 @@ LL |     let ft =
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0320`.
diff --git a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_3.rs b/tests/ui/dropck/dropck_no_diverge_on_nonregular_3.rs
index af7402ca4..af7402ca4 100644
--- a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_3.rs
+++ b/tests/ui/dropck/dropck_no_diverge_on_nonregular_3.rs
diff --git a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_3.stderr b/tests/ui/dropck/dropck_no_diverge_on_nonregular_3.stderr
index 18cd1b6cd..deaf116b6 100644
--- a/src/test/ui/dropck/dropck_no_diverge_on_nonregular_3.stderr
+++ b/tests/ui/dropck/dropck_no_diverge_on_nonregular_3.stderr
@@ -16,3 +16,4 @@ LL |         Some(Wrapper::Simple::<u32>);
 
 error: aborting due to 2 previous errors
 
+For more information about this error, try `rustc --explain E0320`.
diff --git a/src/test/ui/dropck/dropck_trait_cycle_checked.rs b/tests/ui/dropck/dropck_trait_cycle_checked.rs
index be6ec3e4e..be6ec3e4e 100644
--- a/src/test/ui/dropck/dropck_trait_cycle_checked.rs
+++ b/tests/ui/dropck/dropck_trait_cycle_checked.rs
diff --git a/src/test/ui/dropck/dropck_trait_cycle_checked.stderr b/tests/ui/dropck/dropck_trait_cycle_checked.stderr
index dc3fbed59..dc3fbed59 100644
--- a/src/test/ui/dropck/dropck_trait_cycle_checked.stderr
+++ b/tests/ui/dropck/dropck_trait_cycle_checked.stderr
diff --git a/src/test/ui/dropck/dropck_traits.rs b/tests/ui/dropck/dropck_traits.rs
index 98e8e88a2..98e8e88a2 100644
--- a/src/test/ui/dropck/dropck_traits.rs
+++ b/tests/ui/dropck/dropck_traits.rs
diff --git a/src/test/ui/dropck/issue-24805-dropck-itemless.rs b/tests/ui/dropck/issue-24805-dropck-itemless.rs
index 45761b61c..45761b61c 100644
--- a/src/test/ui/dropck/issue-24805-dropck-itemless.rs
+++ b/tests/ui/dropck/issue-24805-dropck-itemless.rs
diff --git a/src/test/ui/dropck/issue-28498-ugeh-with-lifetime-param.rs b/tests/ui/dropck/issue-28498-ugeh-with-lifetime-param.rs
index 43c0bfb26..43c0bfb26 100644
--- a/src/test/ui/dropck/issue-28498-ugeh-with-lifetime-param.rs
+++ b/tests/ui/dropck/issue-28498-ugeh-with-lifetime-param.rs
diff --git a/src/test/ui/dropck/issue-28498-ugeh-with-passed-to-fn.rs b/tests/ui/dropck/issue-28498-ugeh-with-passed-to-fn.rs
index 04d0d3203..04d0d3203 100644
--- a/src/test/ui/dropck/issue-28498-ugeh-with-passed-to-fn.rs
+++ b/tests/ui/dropck/issue-28498-ugeh-with-passed-to-fn.rs
diff --git a/src/test/ui/dropck/issue-28498-ugeh-with-trait-bound.rs b/tests/ui/dropck/issue-28498-ugeh-with-trait-bound.rs
index 61d11cf38..61d11cf38 100644
--- a/src/test/ui/dropck/issue-28498-ugeh-with-trait-bound.rs
+++ b/tests/ui/dropck/issue-28498-ugeh-with-trait-bound.rs
diff --git a/src/test/ui/dropck/issue-29844.rs b/tests/ui/dropck/issue-29844.rs
index e08942da5..e08942da5 100644
--- a/src/test/ui/dropck/issue-29844.rs
+++ b/tests/ui/dropck/issue-29844.rs
diff --git a/src/test/ui/issues/issue-34053.rs b/tests/ui/dropck/issue-34053.rs
index fa23ae8f9..fa23ae8f9 100644
--- a/src/test/ui/issues/issue-34053.rs
+++ b/tests/ui/dropck/issue-34053.rs
diff --git a/src/test/ui/dropck/issue-38868.rs b/tests/ui/dropck/issue-38868.rs
index b0e5c3713..b0e5c3713 100644
--- a/src/test/ui/dropck/issue-38868.rs
+++ b/tests/ui/dropck/issue-38868.rs
diff --git a/src/test/ui/dropck/issue-38868.stderr b/tests/ui/dropck/issue-38868.stderr
index ec81c2ea6..ec81c2ea6 100644
--- a/src/test/ui/dropck/issue-38868.stderr
+++ b/tests/ui/dropck/issue-38868.stderr
diff --git a/src/test/ui/dropck/issue-54943-1.rs b/tests/ui/dropck/issue-54943-1.rs
index ec682d960..ec682d960 100644
--- a/src/test/ui/dropck/issue-54943-1.rs
+++ b/tests/ui/dropck/issue-54943-1.rs
diff --git a/src/test/ui/dropck/issue-54943-2.rs b/tests/ui/dropck/issue-54943-2.rs
index d400ae58d..d400ae58d 100644
--- a/src/test/ui/dropck/issue-54943-2.rs
+++ b/tests/ui/dropck/issue-54943-2.rs
diff --git a/src/test/ui/dropck/reject-specialized-drops-8142.rs b/tests/ui/dropck/reject-specialized-drops-8142.rs
index 7a3bbe7cb..7a3bbe7cb 100644
--- a/src/test/ui/dropck/reject-specialized-drops-8142.rs
+++ b/tests/ui/dropck/reject-specialized-drops-8142.rs
diff --git a/src/test/ui/dropck/reject-specialized-drops-8142.stderr b/tests/ui/dropck/reject-specialized-drops-8142.stderr
index cb48221c6..cb48221c6 100644
--- a/src/test/ui/dropck/reject-specialized-drops-8142.stderr
+++ b/tests/ui/dropck/reject-specialized-drops-8142.stderr
diff --git a/src/test/ui/dropck/relate_lt_in_type_outlives_bound.rs b/tests/ui/dropck/relate_lt_in_type_outlives_bound.rs
index 42530d317..42530d317 100644
--- a/src/test/ui/dropck/relate_lt_in_type_outlives_bound.rs
+++ b/tests/ui/dropck/relate_lt_in_type_outlives_bound.rs
diff --git a/src/test/ui/dropck/relate_lt_in_type_outlives_bound.stderr b/tests/ui/dropck/relate_lt_in_type_outlives_bound.stderr
index 3d9685db6..3d9685db6 100644
--- a/src/test/ui/dropck/relate_lt_in_type_outlives_bound.stderr
+++ b/tests/ui/dropck/relate_lt_in_type_outlives_bound.stderr