Merging upstream version 1.68.2+dfsg1.

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

26 files changed, 0 insertions, 0 deletions

diff --git a/src/test/ui/try-block/issue-45124.rs b/tests/ui/try-block/issue-45124.rs
index 942014c91..942014c91 100644
--- a/src/test/ui/try-block/issue-45124.rs
+++ b/tests/ui/try-block/issue-45124.rs
diff --git a/src/test/ui/try-block/try-block-bad-lifetime.rs b/tests/ui/try-block/try-block-bad-lifetime.rs
index d9524e99f..d9524e99f 100644
--- a/src/test/ui/try-block/try-block-bad-lifetime.rs
+++ b/tests/ui/try-block/try-block-bad-lifetime.rs
diff --git a/src/test/ui/try-block/try-block-bad-lifetime.stderr b/tests/ui/try-block/try-block-bad-lifetime.stderr
index ea079e30d..ea079e30d 100644
--- a/src/test/ui/try-block/try-block-bad-lifetime.stderr
+++ b/tests/ui/try-block/try-block-bad-lifetime.stderr
diff --git a/src/test/ui/try-block/try-block-bad-type.rs b/tests/ui/try-block/try-block-bad-type.rs
index 30ae96763..30ae96763 100644
--- a/src/test/ui/try-block/try-block-bad-type.rs
+++ b/tests/ui/try-block/try-block-bad-type.rs
diff --git a/src/test/ui/try-block/try-block-bad-type.stderr b/tests/ui/try-block/try-block-bad-type.stderr
index e11c3f810..e11c3f810 100644
--- a/src/test/ui/try-block/try-block-bad-type.stderr
+++ b/tests/ui/try-block/try-block-bad-type.stderr
diff --git a/src/test/ui/try-block/try-block-catch.rs b/tests/ui/try-block/try-block-catch.rs
index d16501561..d16501561 100644
--- a/src/test/ui/try-block/try-block-catch.rs
+++ b/tests/ui/try-block/try-block-catch.rs
diff --git a/src/test/ui/try-block/try-block-catch.stderr b/tests/ui/try-block/try-block-catch.stderr
index 39cf943f4..39cf943f4 100644
--- a/src/test/ui/try-block/try-block-catch.stderr
+++ b/tests/ui/try-block/try-block-catch.stderr
diff --git a/src/test/ui/try-block/try-block-in-edition2015.rs b/tests/ui/try-block/try-block-in-edition2015.rs
index 009642973..009642973 100644
--- a/src/test/ui/try-block/try-block-in-edition2015.rs
+++ b/tests/ui/try-block/try-block-in-edition2015.rs
diff --git a/src/test/ui/try-block/try-block-in-edition2015.stderr b/tests/ui/try-block/try-block-in-edition2015.stderr
index a00064c44..a00064c44 100644
--- a/src/test/ui/try-block/try-block-in-edition2015.stderr
+++ b/tests/ui/try-block/try-block-in-edition2015.stderr
diff --git a/src/test/ui/try-block/try-block-in-match.rs b/tests/ui/try-block/try-block-in-match.rs
index cd0b967e7..cd0b967e7 100644
--- a/src/test/ui/try-block/try-block-in-match.rs
+++ b/tests/ui/try-block/try-block-in-match.rs
diff --git a/src/test/ui/try-block/try-block-in-return.rs b/tests/ui/try-block/try-block-in-return.rs
index a15bfeef1..a15bfeef1 100644
--- a/src/test/ui/try-block/try-block-in-return.rs
+++ b/tests/ui/try-block/try-block-in-return.rs
diff --git a/src/test/ui/try-block/try-block-in-while.rs b/tests/ui/try-block/try-block-in-while.rs
index 69793df52..69793df52 100644
--- a/src/test/ui/try-block/try-block-in-while.rs
+++ b/tests/ui/try-block/try-block-in-while.rs
diff --git a/src/test/ui/try-block/try-block-in-while.stderr b/tests/ui/try-block/try-block-in-while.stderr
index 62cc26dd4..62cc26dd4 100644
--- a/src/test/ui/try-block/try-block-in-while.stderr
+++ b/tests/ui/try-block/try-block-in-while.stderr
diff --git a/src/test/ui/try-block/try-block-maybe-bad-lifetime.rs b/tests/ui/try-block/try-block-maybe-bad-lifetime.rs
index cd2ddf63a..cd2ddf63a 100644
--- a/src/test/ui/try-block/try-block-maybe-bad-lifetime.rs
+++ b/tests/ui/try-block/try-block-maybe-bad-lifetime.rs
diff --git a/src/test/ui/try-block/try-block-maybe-bad-lifetime.stderr b/tests/ui/try-block/try-block-maybe-bad-lifetime.stderr
index f738b03ee..f738b03ee 100644
--- a/src/test/ui/try-block/try-block-maybe-bad-lifetime.stderr
+++ b/tests/ui/try-block/try-block-maybe-bad-lifetime.stderr
diff --git a/src/test/ui/try-block/try-block-opt-init.rs b/tests/ui/try-block/try-block-opt-init.rs
index f4f45abcc..f4f45abcc 100644
--- a/src/test/ui/try-block/try-block-opt-init.rs
+++ b/tests/ui/try-block/try-block-opt-init.rs
diff --git a/src/test/ui/try-block/try-block-opt-init.stderr b/tests/ui/try-block/try-block-opt-init.stderr
index c39738501..c39738501 100644
--- a/src/test/ui/try-block/try-block-opt-init.stderr
+++ b/tests/ui/try-block/try-block-opt-init.stderr
diff --git a/src/test/ui/try-block/try-block-type-error.rs b/tests/ui/try-block/try-block-type-error.rs
index fe1993a37..fe1993a37 100644
--- a/src/test/ui/try-block/try-block-type-error.rs
+++ b/tests/ui/try-block/try-block-type-error.rs
diff --git a/src/test/ui/try-block/try-block-type-error.stderr b/tests/ui/try-block/try-block-type-error.stderr
index 3e9a584a5..3e9a584a5 100644
--- a/src/test/ui/try-block/try-block-type-error.stderr
+++ b/tests/ui/try-block/try-block-type-error.stderr
diff --git a/src/test/ui/try-block/try-block-unreachable-code-lint.rs b/tests/ui/try-block/try-block-unreachable-code-lint.rs
index e1d82ea36..e1d82ea36 100644
--- a/src/test/ui/try-block/try-block-unreachable-code-lint.rs
+++ b/tests/ui/try-block/try-block-unreachable-code-lint.rs
diff --git a/src/test/ui/try-block/try-block-unreachable-code-lint.stderr b/tests/ui/try-block/try-block-unreachable-code-lint.stderr
index 9fc0b661f..9fc0b661f 100644
--- a/src/test/ui/try-block/try-block-unreachable-code-lint.stderr
+++ b/tests/ui/try-block/try-block-unreachable-code-lint.stderr
diff --git a/src/test/ui/try-block/try-block-unused-delims.fixed b/tests/ui/try-block/try-block-unused-delims.fixed
index 756081738..756081738 100644
--- a/src/test/ui/try-block/try-block-unused-delims.fixed
+++ b/tests/ui/try-block/try-block-unused-delims.fixed
diff --git a/src/test/ui/try-block/try-block-unused-delims.rs b/tests/ui/try-block/try-block-unused-delims.rs
index ce087fb35..ce087fb35 100644
--- a/src/test/ui/try-block/try-block-unused-delims.rs
+++ b/tests/ui/try-block/try-block-unused-delims.rs
diff --git a/src/test/ui/try-block/try-block-unused-delims.stderr b/tests/ui/try-block/try-block-unused-delims.stderr
index 765cd9c0f..765cd9c0f 100644
--- a/src/test/ui/try-block/try-block-unused-delims.stderr
+++ b/tests/ui/try-block/try-block-unused-delims.stderr
diff --git a/src/test/ui/try-block/try-block.rs b/tests/ui/try-block/try-block.rs
index c29ccc704..c29ccc704 100644
--- a/src/test/ui/try-block/try-block.rs
+++ b/tests/ui/try-block/try-block.rs
diff --git a/src/test/ui/try-block/try-is-identifier-edition2015.rs b/tests/ui/try-block/try-is-identifier-edition2015.rs
index 90f56d5fa..90f56d5fa 100644
--- a/src/test/ui/try-block/try-is-identifier-edition2015.rs
+++ b/tests/ui/try-block/try-is-identifier-edition2015.rs