Merging upstream version 1.68.2+dfsg1.

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

17 files changed, 0 insertions, 0 deletions

diff --git a/src/test/ui/nll/relate_tys/fn-subtype.rs b/tests/ui/nll/relate_tys/fn-subtype.rs
index ba89fa19c..ba89fa19c 100644
--- a/src/test/ui/nll/relate_tys/fn-subtype.rs
+++ b/tests/ui/nll/relate_tys/fn-subtype.rs
diff --git a/src/test/ui/nll/relate_tys/fn-subtype.stderr b/tests/ui/nll/relate_tys/fn-subtype.stderr
index 21073647e..21073647e 100644
--- a/src/test/ui/nll/relate_tys/fn-subtype.stderr
+++ b/tests/ui/nll/relate_tys/fn-subtype.stderr
diff --git a/src/test/ui/nll/relate_tys/hr-fn-aaa-as-aba.rs b/tests/ui/nll/relate_tys/hr-fn-aaa-as-aba.rs
index 7891bab09..7891bab09 100644
--- a/src/test/ui/nll/relate_tys/hr-fn-aaa-as-aba.rs
+++ b/tests/ui/nll/relate_tys/hr-fn-aaa-as-aba.rs
diff --git a/src/test/ui/nll/relate_tys/hr-fn-aaa-as-aba.stderr b/tests/ui/nll/relate_tys/hr-fn-aaa-as-aba.stderr
index 7d76c916d..7d76c916d 100644
--- a/src/test/ui/nll/relate_tys/hr-fn-aaa-as-aba.stderr
+++ b/tests/ui/nll/relate_tys/hr-fn-aaa-as-aba.stderr
diff --git a/src/test/ui/nll/relate_tys/hr-fn-aau-eq-abu.rs b/tests/ui/nll/relate_tys/hr-fn-aau-eq-abu.rs
index 92730341c..92730341c 100644
--- a/src/test/ui/nll/relate_tys/hr-fn-aau-eq-abu.rs
+++ b/tests/ui/nll/relate_tys/hr-fn-aau-eq-abu.rs
diff --git a/src/test/ui/nll/relate_tys/hr-fn-aba-as-aaa.rs b/tests/ui/nll/relate_tys/hr-fn-aba-as-aaa.rs
index 7cc0acf45..7cc0acf45 100644
--- a/src/test/ui/nll/relate_tys/hr-fn-aba-as-aaa.rs
+++ b/tests/ui/nll/relate_tys/hr-fn-aba-as-aaa.rs
diff --git a/src/test/ui/nll/relate_tys/impl-fn-ignore-binder-via-bottom.rs b/tests/ui/nll/relate_tys/impl-fn-ignore-binder-via-bottom.rs
index 05e2ea047..05e2ea047 100644
--- a/src/test/ui/nll/relate_tys/impl-fn-ignore-binder-via-bottom.rs
+++ b/tests/ui/nll/relate_tys/impl-fn-ignore-binder-via-bottom.rs
diff --git a/src/test/ui/nll/relate_tys/impl-fn-ignore-binder-via-bottom.stderr b/tests/ui/nll/relate_tys/impl-fn-ignore-binder-via-bottom.stderr
index b945ffedd..b945ffedd 100644
--- a/src/test/ui/nll/relate_tys/impl-fn-ignore-binder-via-bottom.stderr
+++ b/tests/ui/nll/relate_tys/impl-fn-ignore-binder-via-bottom.stderr
diff --git a/src/test/ui/nll/relate_tys/issue-48071.rs b/tests/ui/nll/relate_tys/issue-48071.rs
index 73361a0d3..73361a0d3 100644
--- a/src/test/ui/nll/relate_tys/issue-48071.rs
+++ b/tests/ui/nll/relate_tys/issue-48071.rs
diff --git a/src/test/ui/nll/relate_tys/opaque-hrtb.rs b/tests/ui/nll/relate_tys/opaque-hrtb.rs
index 261372523..261372523 100644
--- a/src/test/ui/nll/relate_tys/opaque-hrtb.rs
+++ b/tests/ui/nll/relate_tys/opaque-hrtb.rs
diff --git a/src/test/ui/nll/relate_tys/opaque-hrtb.stderr b/tests/ui/nll/relate_tys/opaque-hrtb.stderr
index d75ec2b57..d75ec2b57 100644
--- a/src/test/ui/nll/relate_tys/opaque-hrtb.stderr
+++ b/tests/ui/nll/relate_tys/opaque-hrtb.stderr
diff --git a/src/test/ui/nll/relate_tys/trait-hrtb.rs b/tests/ui/nll/relate_tys/trait-hrtb.rs
index 7f40e93cd..7f40e93cd 100644
--- a/src/test/ui/nll/relate_tys/trait-hrtb.rs
+++ b/tests/ui/nll/relate_tys/trait-hrtb.rs
diff --git a/src/test/ui/nll/relate_tys/trait-hrtb.stderr b/tests/ui/nll/relate_tys/trait-hrtb.stderr
index aa1927711..aa1927711 100644
--- a/src/test/ui/nll/relate_tys/trait-hrtb.stderr
+++ b/tests/ui/nll/relate_tys/trait-hrtb.stderr
diff --git a/src/test/ui/nll/relate_tys/universe-violation.rs b/tests/ui/nll/relate_tys/universe-violation.rs
index c5f9d4406..c5f9d4406 100644
--- a/src/test/ui/nll/relate_tys/universe-violation.rs
+++ b/tests/ui/nll/relate_tys/universe-violation.rs
diff --git a/src/test/ui/nll/relate_tys/universe-violation.stderr b/tests/ui/nll/relate_tys/universe-violation.stderr
index fe801b42c..fe801b42c 100644
--- a/src/test/ui/nll/relate_tys/universe-violation.stderr
+++ b/tests/ui/nll/relate_tys/universe-violation.stderr
diff --git a/src/test/ui/nll/relate_tys/var-appears-twice.rs b/tests/ui/nll/relate_tys/var-appears-twice.rs
index 77129f446..77129f446 100644
--- a/src/test/ui/nll/relate_tys/var-appears-twice.rs
+++ b/tests/ui/nll/relate_tys/var-appears-twice.rs
diff --git a/src/test/ui/nll/relate_tys/var-appears-twice.stderr b/tests/ui/nll/relate_tys/var-appears-twice.stderr
index d032ce6f2..d032ce6f2 100644
--- a/src/test/ui/nll/relate_tys/var-appears-twice.stderr
+++ b/tests/ui/nll/relate_tys/var-appears-twice.stderr