Merging upstream version 1.68.2+dfsg1.

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

16 files changed, 1 insertions, 4 deletions

diff --git a/src/test/ui/loops/for-each-loop-panic.rs b/tests/ui/loops/for-each-loop-panic.rs
index 5156999f4..5156999f4 100644
--- a/src/test/ui/loops/for-each-loop-panic.rs
+++ b/tests/ui/loops/for-each-loop-panic.rs
diff --git a/src/test/ui/loops/issue-82916.rs b/tests/ui/loops/issue-82916.rs
index 8633ea1e8..8633ea1e8 100644
--- a/src/test/ui/loops/issue-82916.rs
+++ b/tests/ui/loops/issue-82916.rs
diff --git a/src/test/ui/loops/issue-82916.stderr b/tests/ui/loops/issue-82916.stderr
index 57d76016c..e6a60d7bc 100644
--- a/src/test/ui/loops/issue-82916.stderr
+++ b/tests/ui/loops/issue-82916.stderr
@@ -9,11 +9,8 @@ LL |     for y in x {
 LL |     let z = x;
    |             ^ value used here after move
    |
-note: this function takes ownership of the receiver `self`, which moves `x`
+note: `into_iter` takes ownership of the receiver `self`, which moves `x`
   --> $SRC_DIR/core/src/iter/traits/collect.rs:LL:COL
-   |
-LL |     fn into_iter(self) -> Self::IntoIter;
-   |                  ^^^^
 help: consider iterating over a slice of the `Vec<S>`'s content to avoid moving into the `for` loop
    |
 LL |     for y in &x {
diff --git a/src/test/ui/loops/loop-break-unsize.rs b/tests/ui/loops/loop-break-unsize.rs
index 974c63cea..974c63cea 100644
--- a/src/test/ui/loops/loop-break-unsize.rs
+++ b/tests/ui/loops/loop-break-unsize.rs
diff --git a/src/test/ui/loops/loop-break-value-no-repeat.rs b/tests/ui/loops/loop-break-value-no-repeat.rs
index 1c0b7a018..1c0b7a018 100644
--- a/src/test/ui/loops/loop-break-value-no-repeat.rs
+++ b/tests/ui/loops/loop-break-value-no-repeat.rs
diff --git a/src/test/ui/loops/loop-break-value-no-repeat.stderr b/tests/ui/loops/loop-break-value-no-repeat.stderr
index 605a1841c..605a1841c 100644
--- a/src/test/ui/loops/loop-break-value-no-repeat.stderr
+++ b/tests/ui/loops/loop-break-value-no-repeat.stderr
diff --git a/src/test/ui/loops/loop-break-value.rs b/tests/ui/loops/loop-break-value.rs
index 51c9a36a0..51c9a36a0 100644
--- a/src/test/ui/loops/loop-break-value.rs
+++ b/tests/ui/loops/loop-break-value.rs
diff --git a/src/test/ui/loops/loop-break-value.stderr b/tests/ui/loops/loop-break-value.stderr
index ccb27c350..ccb27c350 100644
--- a/src/test/ui/loops/loop-break-value.stderr
+++ b/tests/ui/loops/loop-break-value.stderr
diff --git a/src/test/ui/loops/loop-labeled-break-value.rs b/tests/ui/loops/loop-labeled-break-value.rs
index 3488b057b..3488b057b 100644
--- a/src/test/ui/loops/loop-labeled-break-value.rs
+++ b/tests/ui/loops/loop-labeled-break-value.rs
diff --git a/src/test/ui/loops/loop-labeled-break-value.stderr b/tests/ui/loops/loop-labeled-break-value.stderr
index aa04d330f..aa04d330f 100644
--- a/src/test/ui/loops/loop-labeled-break-value.stderr
+++ b/tests/ui/loops/loop-labeled-break-value.stderr
diff --git a/src/test/ui/loops/loop-no-implicit-break.rs b/tests/ui/loops/loop-no-implicit-break.rs
index 93078cb4b..93078cb4b 100644
--- a/src/test/ui/loops/loop-no-implicit-break.rs
+++ b/tests/ui/loops/loop-no-implicit-break.rs
diff --git a/src/test/ui/loops/loop-no-implicit-break.stderr b/tests/ui/loops/loop-no-implicit-break.stderr
index 8a1afdea2..8a1afdea2 100644
--- a/src/test/ui/loops/loop-no-implicit-break.stderr
+++ b/tests/ui/loops/loop-no-implicit-break.stderr
diff --git a/src/test/ui/loops/loop-proper-liveness.rs b/tests/ui/loops/loop-proper-liveness.rs
index 6546e3977..6546e3977 100644
--- a/src/test/ui/loops/loop-proper-liveness.rs
+++ b/tests/ui/loops/loop-proper-liveness.rs
diff --git a/src/test/ui/loops/loop-proper-liveness.stderr b/tests/ui/loops/loop-proper-liveness.stderr
index f9d94b681..f9d94b681 100644
--- a/src/test/ui/loops/loop-proper-liveness.stderr
+++ b/tests/ui/loops/loop-proper-liveness.stderr
diff --git a/src/test/ui/loops/loop-properly-diverging-2.rs b/tests/ui/loops/loop-properly-diverging-2.rs
index 97b3972c1..97b3972c1 100644
--- a/src/test/ui/loops/loop-properly-diverging-2.rs
+++ b/tests/ui/loops/loop-properly-diverging-2.rs
diff --git a/src/test/ui/loops/loop-properly-diverging-2.stderr b/tests/ui/loops/loop-properly-diverging-2.stderr
index 5030a2935..5030a2935 100644
--- a/src/test/ui/loops/loop-properly-diverging-2.stderr
+++ b/tests/ui/loops/loop-properly-diverging-2.stderr