Merging upstream version 1.68.2+dfsg1.

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

25 files changed, 3 insertions, 1 deletions

diff --git a/src/test/ui/block-result/block-must-not-have-result-do.rs b/tests/ui/block-result/block-must-not-have-result-do.rs
index 4fdb69778..4fdb69778 100644
--- a/src/test/ui/block-result/block-must-not-have-result-do.rs
+++ b/tests/ui/block-result/block-must-not-have-result-do.rs
diff --git a/src/test/ui/block-result/block-must-not-have-result-do.stderr b/tests/ui/block-result/block-must-not-have-result-do.stderr
index 914886f81..914886f81 100644
--- a/src/test/ui/block-result/block-must-not-have-result-do.stderr
+++ b/tests/ui/block-result/block-must-not-have-result-do.stderr
diff --git a/src/test/ui/block-result/block-must-not-have-result-res.rs b/tests/ui/block-result/block-must-not-have-result-res.rs
index 7e86274a1..7e86274a1 100644
--- a/src/test/ui/block-result/block-must-not-have-result-res.rs
+++ b/tests/ui/block-result/block-must-not-have-result-res.rs
diff --git a/src/test/ui/block-result/block-must-not-have-result-res.stderr b/tests/ui/block-result/block-must-not-have-result-res.stderr
index 0080d06dd..0080d06dd 100644
--- a/src/test/ui/block-result/block-must-not-have-result-res.stderr
+++ b/tests/ui/block-result/block-must-not-have-result-res.stderr
diff --git a/src/test/ui/block-result/block-must-not-have-result-while.rs b/tests/ui/block-result/block-must-not-have-result-while.rs
index 418059bf2..418059bf2 100644
--- a/src/test/ui/block-result/block-must-not-have-result-while.rs
+++ b/tests/ui/block-result/block-must-not-have-result-while.rs
diff --git a/src/test/ui/block-result/block-must-not-have-result-while.stderr b/tests/ui/block-result/block-must-not-have-result-while.stderr
index 7f96aa289..7f96aa289 100644
--- a/src/test/ui/block-result/block-must-not-have-result-while.stderr
+++ b/tests/ui/block-result/block-must-not-have-result-while.stderr
diff --git a/src/test/ui/block-result/consider-removing-last-semi.fixed b/tests/ui/block-result/consider-removing-last-semi.fixed
index 36a769fe5..36a769fe5 100644
--- a/src/test/ui/block-result/consider-removing-last-semi.fixed
+++ b/tests/ui/block-result/consider-removing-last-semi.fixed
diff --git a/src/test/ui/block-result/consider-removing-last-semi.rs b/tests/ui/block-result/consider-removing-last-semi.rs
index b9a731489..b9a731489 100644
--- a/src/test/ui/block-result/consider-removing-last-semi.rs
+++ b/tests/ui/block-result/consider-removing-last-semi.rs
diff --git a/src/test/ui/block-result/consider-removing-last-semi.stderr b/tests/ui/block-result/consider-removing-last-semi.stderr
index 9be0367ae..9be0367ae 100644
--- a/src/test/ui/block-result/consider-removing-last-semi.stderr
+++ b/tests/ui/block-result/consider-removing-last-semi.stderr
diff --git a/src/test/ui/block-result/issue-11714.rs b/tests/ui/block-result/issue-11714.rs
index 3dda7e801..3dda7e801 100644
--- a/src/test/ui/block-result/issue-11714.rs
+++ b/tests/ui/block-result/issue-11714.rs
diff --git a/src/test/ui/block-result/issue-11714.stderr b/tests/ui/block-result/issue-11714.stderr
index 42fb3d3d4..42fb3d3d4 100644
--- a/src/test/ui/block-result/issue-11714.stderr
+++ b/tests/ui/block-result/issue-11714.stderr
diff --git a/src/test/ui/block-result/issue-13428.rs b/tests/ui/block-result/issue-13428.rs
index ac8596435..ac8596435 100644
--- a/src/test/ui/block-result/issue-13428.rs
+++ b/tests/ui/block-result/issue-13428.rs
diff --git a/src/test/ui/block-result/issue-13428.stderr b/tests/ui/block-result/issue-13428.stderr
index 2b386d10c..2b386d10c 100644
--- a/src/test/ui/block-result/issue-13428.stderr
+++ b/tests/ui/block-result/issue-13428.stderr
diff --git a/src/test/ui/block-result/issue-13624.rs b/tests/ui/block-result/issue-13624.rs
index 4d2844cc5..4d2844cc5 100644
--- a/src/test/ui/block-result/issue-13624.rs
+++ b/tests/ui/block-result/issue-13624.rs
diff --git a/src/test/ui/block-result/issue-13624.stderr b/tests/ui/block-result/issue-13624.stderr
index 13070b4e8..13070b4e8 100644
--- a/src/test/ui/block-result/issue-13624.stderr
+++ b/tests/ui/block-result/issue-13624.stderr
diff --git a/src/test/ui/block-result/issue-20862.rs b/tests/ui/block-result/issue-20862.rs
index e435fd7ae..e435fd7ae 100644
--- a/src/test/ui/block-result/issue-20862.rs
+++ b/tests/ui/block-result/issue-20862.rs
diff --git a/src/test/ui/block-result/issue-20862.stderr b/tests/ui/block-result/issue-20862.stderr
index 37bad64c5..37bad64c5 100644
--- a/src/test/ui/block-result/issue-20862.stderr
+++ b/tests/ui/block-result/issue-20862.stderr
diff --git a/src/test/ui/block-result/issue-22645.rs b/tests/ui/block-result/issue-22645.rs
index 5f7fb8dd3..5f7fb8dd3 100644
--- a/src/test/ui/block-result/issue-22645.rs
+++ b/tests/ui/block-result/issue-22645.rs
diff --git a/src/test/ui/block-result/issue-22645.stderr b/tests/ui/block-result/issue-22645.stderr
index 28debd60a..24341c0f5 100644
--- a/src/test/ui/block-result/issue-22645.stderr
+++ b/tests/ui/block-result/issue-22645.stderr
@@ -9,7 +9,9 @@ note: required for `Bob` to implement `Add<{integer}>`
   --> $DIR/issue-22645.rs:8:19
    |
 LL | impl<RHS: Scalar> Add <RHS> for Bob {
-   |                   ^^^^^^^^^     ^^^
+   |           ------  ^^^^^^^^^     ^^^
+   |           |
+   |           unsatisfied trait bound introduced here
 
 error[E0308]: mismatched types
   --> $DIR/issue-22645.rs:15:3
diff --git a/src/test/ui/block-result/issue-3563.rs b/tests/ui/block-result/issue-3563.rs
index 0b652a1f5..0b652a1f5 100644
--- a/src/test/ui/block-result/issue-3563.rs
+++ b/tests/ui/block-result/issue-3563.rs
diff --git a/src/test/ui/block-result/issue-3563.stderr b/tests/ui/block-result/issue-3563.stderr
index be551f6e8..be551f6e8 100644
--- a/src/test/ui/block-result/issue-3563.stderr
+++ b/tests/ui/block-result/issue-3563.stderr
diff --git a/src/test/ui/block-result/issue-5500.rs b/tests/ui/block-result/issue-5500.rs
index 577987a45..577987a45 100644
--- a/src/test/ui/block-result/issue-5500.rs
+++ b/tests/ui/block-result/issue-5500.rs
diff --git a/src/test/ui/block-result/issue-5500.stderr b/tests/ui/block-result/issue-5500.stderr
index 211a60528..211a60528 100644
--- a/src/test/ui/block-result/issue-5500.stderr
+++ b/tests/ui/block-result/issue-5500.stderr
diff --git a/src/test/ui/block-result/unexpected-return-on-unit.rs b/tests/ui/block-result/unexpected-return-on-unit.rs
index 2fcbfe8c0..2fcbfe8c0 100644
--- a/src/test/ui/block-result/unexpected-return-on-unit.rs
+++ b/tests/ui/block-result/unexpected-return-on-unit.rs
diff --git a/src/test/ui/block-result/unexpected-return-on-unit.stderr b/tests/ui/block-result/unexpected-return-on-unit.stderr
index 4acb955a8..4acb955a8 100644
--- a/src/test/ui/block-result/unexpected-return-on-unit.stderr
+++ b/tests/ui/block-result/unexpected-return-on-unit.stderr