Merging upstream version 1.68.2+dfsg1.

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

23 files changed, 0 insertions, 0 deletions

diff --git a/src/test/ui/consts/control-flow/assert.rs b/tests/ui/consts/control-flow/assert.rs
index 9d17f65b9..9d17f65b9 100644
--- a/src/test/ui/consts/control-flow/assert.rs
+++ b/tests/ui/consts/control-flow/assert.rs
diff --git a/src/test/ui/consts/control-flow/assert.stderr b/tests/ui/consts/control-flow/assert.stderr
index 8b1ca183d..8b1ca183d 100644
--- a/src/test/ui/consts/control-flow/assert.stderr
+++ b/tests/ui/consts/control-flow/assert.stderr
diff --git a/src/test/ui/consts/control-flow/basics.rs b/tests/ui/consts/control-flow/basics.rs
index 02e5501f1..02e5501f1 100644
--- a/src/test/ui/consts/control-flow/basics.rs
+++ b/tests/ui/consts/control-flow/basics.rs
diff --git a/src/test/ui/consts/control-flow/drop-fail.precise.stderr b/tests/ui/consts/control-flow/drop-fail.precise.stderr
index 93b5f257e..93b5f257e 100644
--- a/src/test/ui/consts/control-flow/drop-fail.precise.stderr
+++ b/tests/ui/consts/control-flow/drop-fail.precise.stderr
diff --git a/src/test/ui/consts/control-flow/drop-fail.rs b/tests/ui/consts/control-flow/drop-fail.rs
index 41341f312..41341f312 100644
--- a/src/test/ui/consts/control-flow/drop-fail.rs
+++ b/tests/ui/consts/control-flow/drop-fail.rs
diff --git a/src/test/ui/consts/control-flow/drop-fail.stock.stderr b/tests/ui/consts/control-flow/drop-fail.stock.stderr
index 2cc856802..2cc856802 100644
--- a/src/test/ui/consts/control-flow/drop-fail.stock.stderr
+++ b/tests/ui/consts/control-flow/drop-fail.stock.stderr
diff --git a/src/test/ui/consts/control-flow/drop-pass.rs b/tests/ui/consts/control-flow/drop-pass.rs
index 2a6d12768..2a6d12768 100644
--- a/src/test/ui/consts/control-flow/drop-pass.rs
+++ b/tests/ui/consts/control-flow/drop-pass.rs
diff --git a/src/test/ui/consts/control-flow/drop-precise.rs b/tests/ui/consts/control-flow/drop-precise.rs
index 4ecc5ef78..4ecc5ef78 100644
--- a/src/test/ui/consts/control-flow/drop-precise.rs
+++ b/tests/ui/consts/control-flow/drop-precise.rs
diff --git a/src/test/ui/consts/control-flow/exhaustive-c-like-enum-match.rs b/tests/ui/consts/control-flow/exhaustive-c-like-enum-match.rs
index 4320133df..4320133df 100644
--- a/src/test/ui/consts/control-flow/exhaustive-c-like-enum-match.rs
+++ b/tests/ui/consts/control-flow/exhaustive-c-like-enum-match.rs
diff --git a/src/test/ui/consts/control-flow/feature-gate-const-if-match.rs b/tests/ui/consts/control-flow/feature-gate-const-if-match.rs
index cb66bc753..cb66bc753 100644
--- a/src/test/ui/consts/control-flow/feature-gate-const-if-match.rs
+++ b/tests/ui/consts/control-flow/feature-gate-const-if-match.rs
diff --git a/src/test/ui/consts/control-flow/interior-mutability.rs b/tests/ui/consts/control-flow/interior-mutability.rs
index a6d44237b..a6d44237b 100644
--- a/src/test/ui/consts/control-flow/interior-mutability.rs
+++ b/tests/ui/consts/control-flow/interior-mutability.rs
diff --git a/src/test/ui/consts/control-flow/interior-mutability.stderr b/tests/ui/consts/control-flow/interior-mutability.stderr
index db2ffb91b..db2ffb91b 100644
--- a/src/test/ui/consts/control-flow/interior-mutability.stderr
+++ b/tests/ui/consts/control-flow/interior-mutability.stderr
diff --git a/src/test/ui/consts/control-flow/issue-46843.rs b/tests/ui/consts/control-flow/issue-46843.rs
index ddddc8505..ddddc8505 100644
--- a/src/test/ui/consts/control-flow/issue-46843.rs
+++ b/tests/ui/consts/control-flow/issue-46843.rs
diff --git a/src/test/ui/consts/control-flow/issue-46843.stderr b/tests/ui/consts/control-flow/issue-46843.stderr
index 66227f61e..66227f61e 100644
--- a/src/test/ui/consts/control-flow/issue-46843.stderr
+++ b/tests/ui/consts/control-flow/issue-46843.stderr
diff --git a/src/test/ui/consts/control-flow/issue-50577.rs b/tests/ui/consts/control-flow/issue-50577.rs
index beb9a44fc..beb9a44fc 100644
--- a/src/test/ui/consts/control-flow/issue-50577.rs
+++ b/tests/ui/consts/control-flow/issue-50577.rs
diff --git a/src/test/ui/consts/control-flow/issue-50577.stderr b/tests/ui/consts/control-flow/issue-50577.stderr
index a931c89f4..a931c89f4 100644
--- a/src/test/ui/consts/control-flow/issue-50577.stderr
+++ b/tests/ui/consts/control-flow/issue-50577.stderr
diff --git a/src/test/ui/consts/control-flow/loop.rs b/tests/ui/consts/control-flow/loop.rs
index 2b8561a26..2b8561a26 100644
--- a/src/test/ui/consts/control-flow/loop.rs
+++ b/tests/ui/consts/control-flow/loop.rs
diff --git a/src/test/ui/consts/control-flow/loop.stderr b/tests/ui/consts/control-flow/loop.stderr
index 5f6ad8c10..5f6ad8c10 100644
--- a/src/test/ui/consts/control-flow/loop.stderr
+++ b/tests/ui/consts/control-flow/loop.stderr
diff --git a/src/test/ui/consts/control-flow/short-circuit-let.rs b/tests/ui/consts/control-flow/short-circuit-let.rs
index 8a58d06ac..8a58d06ac 100644
--- a/src/test/ui/consts/control-flow/short-circuit-let.rs
+++ b/tests/ui/consts/control-flow/short-circuit-let.rs
diff --git a/src/test/ui/consts/control-flow/short-circuit.rs b/tests/ui/consts/control-flow/short-circuit.rs
index 6abe10785..6abe10785 100644
--- a/src/test/ui/consts/control-flow/short-circuit.rs
+++ b/tests/ui/consts/control-flow/short-circuit.rs
diff --git a/src/test/ui/consts/control-flow/single_variant_match_ice.rs b/tests/ui/consts/control-flow/single_variant_match_ice.rs
index b59be00ff..b59be00ff 100644
--- a/src/test/ui/consts/control-flow/single_variant_match_ice.rs
+++ b/tests/ui/consts/control-flow/single_variant_match_ice.rs
diff --git a/src/test/ui/consts/control-flow/try.rs b/tests/ui/consts/control-flow/try.rs
index 7d85a412b..7d85a412b 100644
--- a/src/test/ui/consts/control-flow/try.rs
+++ b/tests/ui/consts/control-flow/try.rs
diff --git a/src/test/ui/consts/control-flow/try.stderr b/tests/ui/consts/control-flow/try.stderr
index 5aeec8fbf..5aeec8fbf 100644
--- a/src/test/ui/consts/control-flow/try.stderr
+++ b/tests/ui/consts/control-flow/try.stderr