Merging upstream version 1.68.2+dfsg1.

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

18 files changed, 5 insertions, 0 deletions

diff --git a/src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.rs b/tests/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.rs
index 54ab9f0ad..54ab9f0ad 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.rs
+++ b/tests/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.rs
diff --git a/src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.stderr b/tests/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.stderr
index b7c0b0bb6..b7c0b0bb6 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.stderr
+++ b/tests/ui/rfc-2005-default-binding-mode/borrowck-issue-49631.stderr
diff --git a/src/test/ui/rfc-2005-default-binding-mode/const.rs b/tests/ui/rfc-2005-default-binding-mode/const.rs
index 93df88040..93df88040 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/const.rs
+++ b/tests/ui/rfc-2005-default-binding-mode/const.rs
diff --git a/src/test/ui/rfc-2005-default-binding-mode/const.stderr b/tests/ui/rfc-2005-default-binding-mode/const.stderr
index 0f5671254..0f5671254 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/const.stderr
+++ b/tests/ui/rfc-2005-default-binding-mode/const.stderr
diff --git a/src/test/ui/rfc-2005-default-binding-mode/enum.rs b/tests/ui/rfc-2005-default-binding-mode/enum.rs
index 4e57769d6..4e57769d6 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/enum.rs
+++ b/tests/ui/rfc-2005-default-binding-mode/enum.rs
diff --git a/src/test/ui/rfc-2005-default-binding-mode/enum.stderr b/tests/ui/rfc-2005-default-binding-mode/enum.stderr
index 21e3d3d27..21e3d3d27 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/enum.stderr
+++ b/tests/ui/rfc-2005-default-binding-mode/enum.stderr
diff --git a/src/test/ui/rfc-2005-default-binding-mode/explicit-mut.rs b/tests/ui/rfc-2005-default-binding-mode/explicit-mut.rs
index b8fde2208..b8fde2208 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/explicit-mut.rs
+++ b/tests/ui/rfc-2005-default-binding-mode/explicit-mut.rs
diff --git a/src/test/ui/rfc-2005-default-binding-mode/explicit-mut.stderr b/tests/ui/rfc-2005-default-binding-mode/explicit-mut.stderr
index c3f64f65a..c3f64f65a 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/explicit-mut.stderr
+++ b/tests/ui/rfc-2005-default-binding-mode/explicit-mut.stderr
diff --git a/src/test/ui/rfc-2005-default-binding-mode/for.rs b/tests/ui/rfc-2005-default-binding-mode/for.rs
index d6c5a13b1..d6c5a13b1 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/for.rs
+++ b/tests/ui/rfc-2005-default-binding-mode/for.rs
diff --git a/src/test/ui/rfc-2005-default-binding-mode/for.stderr b/tests/ui/rfc-2005-default-binding-mode/for.stderr
index 9cc20a7bf..07991af6e 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/for.stderr
+++ b/tests/ui/rfc-2005-default-binding-mode/for.stderr
@@ -6,6 +6,11 @@ LL |     for (n, mut m) in &tups {
    |             |
    |             data moved here
    |             move occurs because `m` has type `Foo`, which does not implement the `Copy` trait
+   |
+help: consider borrowing the pattern binding
+   |
+LL |     for (n, ref mut m) in &tups {
+   |             +++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.rs b/tests/ui/rfc-2005-default-binding-mode/issue-44912-or.rs
index b4a0d8145..b4a0d8145 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.rs
+++ b/tests/ui/rfc-2005-default-binding-mode/issue-44912-or.rs
diff --git a/src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.stderr b/tests/ui/rfc-2005-default-binding-mode/issue-44912-or.stderr
index e1e1bf7f6..e1e1bf7f6 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.stderr
+++ b/tests/ui/rfc-2005-default-binding-mode/issue-44912-or.stderr
diff --git a/src/test/ui/rfc-2005-default-binding-mode/lit.rs b/tests/ui/rfc-2005-default-binding-mode/lit.rs
index ce79cfbdc..ce79cfbdc 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/lit.rs
+++ b/tests/ui/rfc-2005-default-binding-mode/lit.rs
diff --git a/src/test/ui/rfc-2005-default-binding-mode/lit.stderr b/tests/ui/rfc-2005-default-binding-mode/lit.stderr
index 11bc170cd..11bc170cd 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/lit.stderr
+++ b/tests/ui/rfc-2005-default-binding-mode/lit.stderr
diff --git a/src/test/ui/rfc-2005-default-binding-mode/no-double-error.rs b/tests/ui/rfc-2005-default-binding-mode/no-double-error.rs
index 46fdfd678..46fdfd678 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/no-double-error.rs
+++ b/tests/ui/rfc-2005-default-binding-mode/no-double-error.rs
diff --git a/src/test/ui/rfc-2005-default-binding-mode/no-double-error.stderr b/tests/ui/rfc-2005-default-binding-mode/no-double-error.stderr
index c672acee0..c672acee0 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/no-double-error.stderr
+++ b/tests/ui/rfc-2005-default-binding-mode/no-double-error.stderr
diff --git a/src/test/ui/rfc-2005-default-binding-mode/slice.rs b/tests/ui/rfc-2005-default-binding-mode/slice.rs
index 363a0e3e6..363a0e3e6 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/slice.rs
+++ b/tests/ui/rfc-2005-default-binding-mode/slice.rs
diff --git a/src/test/ui/rfc-2005-default-binding-mode/slice.stderr b/tests/ui/rfc-2005-default-binding-mode/slice.stderr
index 60c1f5420..60c1f5420 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/slice.stderr
+++ b/tests/ui/rfc-2005-default-binding-mode/slice.stderr