Merging upstream version 1.68.2+dfsg1.

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

25 files changed, 0 insertions, 6 deletions

diff --git a/src/test/ui/overloaded/auxiliary/overloaded_autoderef_xc.rs b/tests/ui/overloaded/auxiliary/overloaded_autoderef_xc.rs
index 112455f91..112455f91 100644
--- a/src/test/ui/overloaded/auxiliary/overloaded_autoderef_xc.rs
+++ b/tests/ui/overloaded/auxiliary/overloaded_autoderef_xc.rs
diff --git a/src/test/ui/overloaded/fixup-deref-mut.rs b/tests/ui/overloaded/fixup-deref-mut.rs
index 6b2fd72b8..6b2fd72b8 100644
--- a/src/test/ui/overloaded/fixup-deref-mut.rs
+++ b/tests/ui/overloaded/fixup-deref-mut.rs
diff --git a/src/test/ui/overloaded/issue-14958.rs b/tests/ui/overloaded/issue-14958.rs
index a12564ca9..a12564ca9 100644
--- a/src/test/ui/overloaded/issue-14958.rs
+++ b/tests/ui/overloaded/issue-14958.rs
diff --git a/src/test/ui/overloaded/overloaded-autoderef-count.rs b/tests/ui/overloaded/overloaded-autoderef-count.rs
index d58deda09..d58deda09 100644
--- a/src/test/ui/overloaded/overloaded-autoderef-count.rs
+++ b/tests/ui/overloaded/overloaded-autoderef-count.rs
diff --git a/src/test/ui/overloaded/overloaded-autoderef-indexing.rs b/tests/ui/overloaded/overloaded-autoderef-indexing.rs
index 1c8c7cca9..1c8c7cca9 100644
--- a/src/test/ui/overloaded/overloaded-autoderef-indexing.rs
+++ b/tests/ui/overloaded/overloaded-autoderef-indexing.rs
diff --git a/src/test/ui/overloaded/overloaded-autoderef-order.rs b/tests/ui/overloaded/overloaded-autoderef-order.rs
index f48bae55f..f48bae55f 100644
--- a/src/test/ui/overloaded/overloaded-autoderef-order.rs
+++ b/tests/ui/overloaded/overloaded-autoderef-order.rs
diff --git a/src/test/ui/overloaded/overloaded-autoderef-vtable.rs b/tests/ui/overloaded/overloaded-autoderef-vtable.rs
index f8e6d1208..f8e6d1208 100644
--- a/src/test/ui/overloaded/overloaded-autoderef-vtable.rs
+++ b/tests/ui/overloaded/overloaded-autoderef-vtable.rs
diff --git a/src/test/ui/overloaded/overloaded-autoderef-xcrate.rs b/tests/ui/overloaded/overloaded-autoderef-xcrate.rs
index d065e825c..d065e825c 100644
--- a/src/test/ui/overloaded/overloaded-autoderef-xcrate.rs
+++ b/tests/ui/overloaded/overloaded-autoderef-xcrate.rs
diff --git a/src/test/ui/overloaded/overloaded-autoderef.rs b/tests/ui/overloaded/overloaded-autoderef.rs
index cae3ec906..cae3ec906 100644
--- a/src/test/ui/overloaded/overloaded-autoderef.rs
+++ b/tests/ui/overloaded/overloaded-autoderef.rs
diff --git a/src/test/ui/overloaded/overloaded-calls-nontuple.rs b/tests/ui/overloaded/overloaded-calls-nontuple.rs
index 32a3b93e0..32a3b93e0 100644
--- a/src/test/ui/overloaded/overloaded-calls-nontuple.rs
+++ b/tests/ui/overloaded/overloaded-calls-nontuple.rs
diff --git a/src/test/ui/overloaded/overloaded-calls-nontuple.stderr b/tests/ui/overloaded/overloaded-calls-nontuple.stderr
index 794535aeb..2e1600782 100644
--- a/src/test/ui/overloaded/overloaded-calls-nontuple.stderr
+++ b/tests/ui/overloaded/overloaded-calls-nontuple.stderr
@@ -6,9 +6,6 @@ LL | impl FnMut<isize> for S {
    |
 note: required by a bound in `FnMut`
   --> $SRC_DIR/core/src/ops/function.rs:LL:COL
-   |
-LL | pub trait FnMut<Args: Tuple>: FnOnce<Args> {
-   |                       ^^^^^ required by this bound in `FnMut`
 
 error[E0059]: type parameter to bare `FnOnce` trait must be a tuple
   --> $DIR/overloaded-calls-nontuple.rs:18:6
@@ -18,9 +15,6 @@ LL | impl FnOnce<isize> for S {
    |
 note: required by a bound in `FnOnce`
   --> $SRC_DIR/core/src/ops/function.rs:LL:COL
-   |
-LL | pub trait FnOnce<Args: Tuple> {
-   |                        ^^^^^ required by this bound in `FnOnce`
 
 error[E0277]: functions with the "rust-call" ABI must take a single non-self tuple argument
   --> $DIR/overloaded-calls-nontuple.rs:12:5
diff --git a/src/test/ui/overloaded/overloaded-calls-object-one-arg.rs b/tests/ui/overloaded/overloaded-calls-object-one-arg.rs
index 1afab9a1f..1afab9a1f 100644
--- a/src/test/ui/overloaded/overloaded-calls-object-one-arg.rs
+++ b/tests/ui/overloaded/overloaded-calls-object-one-arg.rs
diff --git a/src/test/ui/overloaded/overloaded-calls-object-two-args.rs b/tests/ui/overloaded/overloaded-calls-object-two-args.rs
index 38087bc87..38087bc87 100644
--- a/src/test/ui/overloaded/overloaded-calls-object-two-args.rs
+++ b/tests/ui/overloaded/overloaded-calls-object-two-args.rs
diff --git a/src/test/ui/overloaded/overloaded-calls-object-zero-args.rs b/tests/ui/overloaded/overloaded-calls-object-zero-args.rs
index 9a7bfaa9b..9a7bfaa9b 100644
--- a/src/test/ui/overloaded/overloaded-calls-object-zero-args.rs
+++ b/tests/ui/overloaded/overloaded-calls-object-zero-args.rs
diff --git a/src/test/ui/overloaded/overloaded-calls-param-vtables.rs b/tests/ui/overloaded/overloaded-calls-param-vtables.rs
index fde1ad20f..fde1ad20f 100644
--- a/src/test/ui/overloaded/overloaded-calls-param-vtables.rs
+++ b/tests/ui/overloaded/overloaded-calls-param-vtables.rs
diff --git a/src/test/ui/overloaded/overloaded-calls-simple.rs b/tests/ui/overloaded/overloaded-calls-simple.rs
index 413183607..413183607 100644
--- a/src/test/ui/overloaded/overloaded-calls-simple.rs
+++ b/tests/ui/overloaded/overloaded-calls-simple.rs
diff --git a/src/test/ui/overloaded/overloaded-calls-zero-args.rs b/tests/ui/overloaded/overloaded-calls-zero-args.rs
index 69ca88619..69ca88619 100644
--- a/src/test/ui/overloaded/overloaded-calls-zero-args.rs
+++ b/tests/ui/overloaded/overloaded-calls-zero-args.rs
diff --git a/src/test/ui/overloaded/overloaded-deref-count.rs b/tests/ui/overloaded/overloaded-deref-count.rs
index e2f1e10b5..e2f1e10b5 100644
--- a/src/test/ui/overloaded/overloaded-deref-count.rs
+++ b/tests/ui/overloaded/overloaded-deref-count.rs
diff --git a/src/test/ui/overloaded/overloaded-deref.rs b/tests/ui/overloaded/overloaded-deref.rs
index 73d8232a3..73d8232a3 100644
--- a/src/test/ui/overloaded/overloaded-deref.rs
+++ b/tests/ui/overloaded/overloaded-deref.rs
diff --git a/src/test/ui/overloaded/overloaded-index-assoc-list.rs b/tests/ui/overloaded/overloaded-index-assoc-list.rs
index eb027afea..eb027afea 100644
--- a/src/test/ui/overloaded/overloaded-index-assoc-list.rs
+++ b/tests/ui/overloaded/overloaded-index-assoc-list.rs
diff --git a/src/test/ui/overloaded/overloaded-index-autoderef.rs b/tests/ui/overloaded/overloaded-index-autoderef.rs
index 41f9efa8c..41f9efa8c 100644
--- a/src/test/ui/overloaded/overloaded-index-autoderef.rs
+++ b/tests/ui/overloaded/overloaded-index-autoderef.rs
diff --git a/src/test/ui/overloaded/overloaded-index-in-field.rs b/tests/ui/overloaded/overloaded-index-in-field.rs
index 8a1fa7deb..8a1fa7deb 100644
--- a/src/test/ui/overloaded/overloaded-index-in-field.rs
+++ b/tests/ui/overloaded/overloaded-index-in-field.rs
diff --git a/src/test/ui/overloaded/overloaded-index.rs b/tests/ui/overloaded/overloaded-index.rs
index 5ad6d2e70..5ad6d2e70 100644
--- a/src/test/ui/overloaded/overloaded-index.rs
+++ b/tests/ui/overloaded/overloaded-index.rs
diff --git a/src/test/ui/overloaded/overloaded_deref_with_ref_pattern.rs b/tests/ui/overloaded/overloaded_deref_with_ref_pattern.rs
index c87ba6a02..c87ba6a02 100644
--- a/src/test/ui/overloaded/overloaded_deref_with_ref_pattern.rs
+++ b/tests/ui/overloaded/overloaded_deref_with_ref_pattern.rs
diff --git a/src/test/ui/overloaded/overloaded_deref_with_ref_pattern_issue15609.rs b/tests/ui/overloaded/overloaded_deref_with_ref_pattern_issue15609.rs
index 61edd2ace..61edd2ace 100644
--- a/src/test/ui/overloaded/overloaded_deref_with_ref_pattern_issue15609.rs
+++ b/tests/ui/overloaded/overloaded_deref_with_ref_pattern_issue15609.rs