Merging upstream version 1.68.2+dfsg1.

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

43 files changed, 10 insertions, 76 deletions

diff --git a/src/test/ui/binop/binary-minus-without-space.rs b/tests/ui/binop/binary-minus-without-space.rs
index 2fbd5300d..2fbd5300d 100644
--- a/src/test/ui/binop/binary-minus-without-space.rs
+++ b/tests/ui/binop/binary-minus-without-space.rs
diff --git a/src/test/ui/binop/binary-op-on-double-ref.fixed b/tests/ui/binop/binary-op-on-double-ref.fixed
index de9dc19af..de9dc19af 100644
--- a/src/test/ui/binop/binary-op-on-double-ref.fixed
+++ b/tests/ui/binop/binary-op-on-double-ref.fixed
diff --git a/src/test/ui/binop/binary-op-on-double-ref.rs b/tests/ui/binop/binary-op-on-double-ref.rs
index 2616c560c..2616c560c 100644
--- a/src/test/ui/binop/binary-op-on-double-ref.rs
+++ b/tests/ui/binop/binary-op-on-double-ref.rs
diff --git a/src/test/ui/binop/binary-op-on-double-ref.stderr b/tests/ui/binop/binary-op-on-double-ref.stderr
index 34826d2f4..34826d2f4 100644
--- a/src/test/ui/binop/binary-op-on-double-ref.stderr
+++ b/tests/ui/binop/binary-op-on-double-ref.stderr
diff --git a/src/test/ui/binop/binary-op-on-fn-ptr-eq.rs b/tests/ui/binop/binary-op-on-fn-ptr-eq.rs
index 8e20640b5..8e20640b5 100644
--- a/src/test/ui/binop/binary-op-on-fn-ptr-eq.rs
+++ b/tests/ui/binop/binary-op-on-fn-ptr-eq.rs
diff --git a/src/test/ui/binop/binop-bitxor-str.rs b/tests/ui/binop/binop-bitxor-str.rs
index 3085cce3f..3085cce3f 100644
--- a/src/test/ui/binop/binop-bitxor-str.rs
+++ b/tests/ui/binop/binop-bitxor-str.rs
diff --git a/src/test/ui/binop/binop-bitxor-str.stderr b/tests/ui/binop/binop-bitxor-str.stderr
index f236cd61e..f236cd61e 100644
--- a/src/test/ui/binop/binop-bitxor-str.stderr
+++ b/tests/ui/binop/binop-bitxor-str.stderr
diff --git a/src/test/ui/binop/binop-consume-args.rs b/tests/ui/binop/binop-consume-args.rs
index 8d6c725d7..8d6c725d7 100644
--- a/src/test/ui/binop/binop-consume-args.rs
+++ b/tests/ui/binop/binop-consume-args.rs
diff --git a/src/test/ui/binop/binop-consume-args.stderr b/tests/ui/binop/binop-consume-args.stderr
index c734f8c1e..6fbbb5543 100644
--- a/src/test/ui/binop/binop-consume-args.stderr
+++ b/tests/ui/binop/binop-consume-args.stderr
@@ -10,9 +10,6 @@ LL |     drop(lhs);
    |
 note: calling this operator moves the left-hand side
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL |     fn add(self, rhs: Rhs) -> Self::Output;
-   |            ^^^^
 help: consider further restricting this bound
    |
 LL | fn add<A: Add<B, Output=()> + Copy, B>(lhs: A, rhs: B) {
@@ -46,9 +43,6 @@ LL |     drop(lhs);
    |
 note: calling this operator moves the left-hand side
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL |     fn sub(self, rhs: Rhs) -> Self::Output;
-   |            ^^^^
 help: consider further restricting this bound
    |
 LL | fn sub<A: Sub<B, Output=()> + Copy, B>(lhs: A, rhs: B) {
@@ -82,9 +76,6 @@ LL |     drop(lhs);
    |
 note: calling this operator moves the left-hand side
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL |     fn mul(self, rhs: Rhs) -> Self::Output;
-   |            ^^^^
 help: consider further restricting this bound
    |
 LL | fn mul<A: Mul<B, Output=()> + Copy, B>(lhs: A, rhs: B) {
@@ -118,9 +109,6 @@ LL |     drop(lhs);
    |
 note: calling this operator moves the left-hand side
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL |     fn div(self, rhs: Rhs) -> Self::Output;
-   |            ^^^^
 help: consider further restricting this bound
    |
 LL | fn div<A: Div<B, Output=()> + Copy, B>(lhs: A, rhs: B) {
@@ -154,9 +142,6 @@ LL |     drop(lhs);
    |
 note: calling this operator moves the left-hand side
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL |     fn rem(self, rhs: Rhs) -> Self::Output;
-   |            ^^^^
 help: consider further restricting this bound
    |
 LL | fn rem<A: Rem<B, Output=()> + Copy, B>(lhs: A, rhs: B) {
@@ -190,9 +175,6 @@ LL |     drop(lhs);
    |
 note: calling this operator moves the left-hand side
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
-   |
-LL |     fn bitand(self, rhs: Rhs) -> Self::Output;
-   |               ^^^^
 help: consider further restricting this bound
    |
 LL | fn bitand<A: BitAnd<B, Output=()> + Copy, B>(lhs: A, rhs: B) {
@@ -226,9 +208,6 @@ LL |     drop(lhs);
    |
 note: calling this operator moves the left-hand side
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
-   |
-LL |     fn bitor(self, rhs: Rhs) -> Self::Output;
-   |              ^^^^
 help: consider further restricting this bound
    |
 LL | fn bitor<A: BitOr<B, Output=()> + Copy, B>(lhs: A, rhs: B) {
@@ -262,9 +241,6 @@ LL |     drop(lhs);
    |
 note: calling this operator moves the left-hand side
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
-   |
-LL |     fn bitxor(self, rhs: Rhs) -> Self::Output;
-   |               ^^^^
 help: consider further restricting this bound
    |
 LL | fn bitxor<A: BitXor<B, Output=()> + Copy, B>(lhs: A, rhs: B) {
@@ -298,9 +274,6 @@ LL |     drop(lhs);
    |
 note: calling this operator moves the left-hand side
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
-   |
-LL |     fn shl(self, rhs: Rhs) -> Self::Output;
-   |            ^^^^
 help: consider further restricting this bound
    |
 LL | fn shl<A: Shl<B, Output=()> + Copy, B>(lhs: A, rhs: B) {
@@ -334,9 +307,6 @@ LL |     drop(lhs);
    |
 note: calling this operator moves the left-hand side
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
-   |
-LL |     fn shr(self, rhs: Rhs) -> Self::Output;
-   |            ^^^^
 help: consider further restricting this bound
    |
 LL | fn shr<A: Shr<B, Output=()> + Copy, B>(lhs: A, rhs: B) {
diff --git a/src/test/ui/binop/binop-fail-3.rs b/tests/ui/binop/binop-fail-3.rs
index 49f635e0c..49f635e0c 100644
--- a/src/test/ui/binop/binop-fail-3.rs
+++ b/tests/ui/binop/binop-fail-3.rs
diff --git a/src/test/ui/binop/binop-logic-float.rs b/tests/ui/binop/binop-logic-float.rs
index 1750d97ba..1750d97ba 100644
--- a/src/test/ui/binop/binop-logic-float.rs
+++ b/tests/ui/binop/binop-logic-float.rs
diff --git a/src/test/ui/binop/binop-logic-float.stderr b/tests/ui/binop/binop-logic-float.stderr
index 3615622ae..3615622ae 100644
--- a/src/test/ui/binop/binop-logic-float.stderr
+++ b/tests/ui/binop/binop-logic-float.stderr
diff --git a/src/test/ui/binop/binop-logic-int.rs b/tests/ui/binop/binop-logic-int.rs
index e71daa2dd..e71daa2dd 100644
--- a/src/test/ui/binop/binop-logic-int.rs
+++ b/tests/ui/binop/binop-logic-int.rs
diff --git a/src/test/ui/binop/binop-logic-int.stderr b/tests/ui/binop/binop-logic-int.stderr
index 50d857cd9..50d857cd9 100644
--- a/src/test/ui/binop/binop-logic-int.stderr
+++ b/tests/ui/binop/binop-logic-int.stderr
diff --git a/src/test/ui/binop/binop-move-semantics.rs b/tests/ui/binop/binop-move-semantics.rs
index b5133ea7c..b5133ea7c 100644
--- a/src/test/ui/binop/binop-move-semantics.rs
+++ b/tests/ui/binop/binop-move-semantics.rs
diff --git a/src/test/ui/binop/binop-move-semantics.stderr b/tests/ui/binop/binop-move-semantics.stderr
index 994eaf9d8..dae267da0 100644
--- a/src/test/ui/binop/binop-move-semantics.stderr
+++ b/tests/ui/binop/binop-move-semantics.stderr
@@ -13,9 +13,6 @@ LL | |     x;
    |
 note: calling this operator moves the left-hand side
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL |     fn add(self, rhs: Rhs) -> Self::Output;
-   |            ^^^^
 help: consider further restricting this bound
    |
 LL | fn double_move<T: Add<Output=()> + Copy>(x: T) {
@@ -78,9 +75,6 @@ LL | |     *n;
    |
 note: calling this operator moves the left-hand side
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL |     fn add(self, rhs: Rhs) -> Self::Output;
-   |            ^^^^
 
 error[E0507]: cannot move out of `*n` which is behind a shared reference
   --> $DIR/binop-move-semantics.rs:32:5
diff --git a/src/test/ui/binop/binop-mul-bool.rs b/tests/ui/binop/binop-mul-bool.rs
index 41494c7a0..41494c7a0 100644
--- a/src/test/ui/binop/binop-mul-bool.rs
+++ b/tests/ui/binop/binop-mul-bool.rs
diff --git a/src/test/ui/binop/binop-mul-bool.stderr b/tests/ui/binop/binop-mul-bool.stderr
index 8b5cde63c..8b5cde63c 100644
--- a/src/test/ui/binop/binop-mul-bool.stderr
+++ b/tests/ui/binop/binop-mul-bool.stderr
diff --git a/src/test/ui/binop/binop-mul-i32-f32.rs b/tests/ui/binop/binop-mul-i32-f32.rs
index d18be51a4..d18be51a4 100644
--- a/src/test/ui/binop/binop-mul-i32-f32.rs
+++ b/tests/ui/binop/binop-mul-i32-f32.rs
diff --git a/src/test/ui/binop/binop-mul-i32-f32.stderr b/tests/ui/binop/binop-mul-i32-f32.stderr
index c986bc3fd..c986bc3fd 100644
--- a/src/test/ui/binop/binop-mul-i32-f32.stderr
+++ b/tests/ui/binop/binop-mul-i32-f32.stderr
diff --git a/src/test/ui/binop/binop-panic.rs b/tests/ui/binop/binop-panic.rs
index 44cdfffee..44cdfffee 100644
--- a/src/test/ui/binop/binop-panic.rs
+++ b/tests/ui/binop/binop-panic.rs
diff --git a/src/test/ui/binop/binop-typeck.rs b/tests/ui/binop/binop-typeck.rs
index 812fe95db..812fe95db 100644
--- a/src/test/ui/binop/binop-typeck.rs
+++ b/tests/ui/binop/binop-typeck.rs
diff --git a/src/test/ui/binop/binop-typeck.stderr b/tests/ui/binop/binop-typeck.stderr
index 42d910819..42d910819 100644
--- a/src/test/ui/binop/binop-typeck.stderr
+++ b/tests/ui/binop/binop-typeck.stderr
diff --git a/src/test/ui/binop/binops-issue-22743.rs b/tests/ui/binop/binops-issue-22743.rs
index 393ba0a56..393ba0a56 100644
--- a/src/test/ui/binop/binops-issue-22743.rs
+++ b/tests/ui/binop/binops-issue-22743.rs
diff --git a/src/test/ui/binop/binops.rs b/tests/ui/binop/binops.rs
index a7abf6087..a7abf6087 100644
--- a/src/test/ui/binop/binops.rs
+++ b/tests/ui/binop/binops.rs
diff --git a/src/test/ui/binop/issue-25916.rs b/tests/ui/binop/issue-25916.rs
index 0b4159479..0b4159479 100644
--- a/src/test/ui/binop/issue-25916.rs
+++ b/tests/ui/binop/issue-25916.rs
diff --git a/src/test/ui/binop/issue-28837.rs b/tests/ui/binop/issue-28837.rs
index 9719c3afa..9719c3afa 100644
--- a/src/test/ui/binop/issue-28837.rs
+++ b/tests/ui/binop/issue-28837.rs
diff --git a/src/test/ui/binop/issue-28837.stderr b/tests/ui/binop/issue-28837.stderr
index b9c7e1bea..6e236ca52 100644
--- a/src/test/ui/binop/issue-28837.stderr
+++ b/tests/ui/binop/issue-28837.stderr
@@ -11,11 +11,8 @@ note: an implementation of `Add<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^ must implement `Add<_>`
-note: the following trait must be implemented
+note: the trait `Add` must be implemented
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL | pub trait Add<Rhs = Self> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0369]: cannot subtract `A` from `A`
   --> $DIR/issue-28837.rs:8:7
@@ -30,11 +27,8 @@ note: an implementation of `Sub<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^ must implement `Sub<_>`
-note: the following trait must be implemented
+note: the trait `Sub` must be implemented
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL | pub trait Sub<Rhs = Self> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0369]: cannot multiply `A` by `A`
   --> $DIR/issue-28837.rs:10:7
@@ -49,11 +43,8 @@ note: an implementation of `Mul<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^ must implement `Mul<_>`
-note: the following trait must be implemented
+note: the trait `Mul` must be implemented
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL | pub trait Mul<Rhs = Self> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0369]: cannot divide `A` by `A`
   --> $DIR/issue-28837.rs:12:7
@@ -68,11 +59,8 @@ note: an implementation of `Div<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^ must implement `Div<_>`
-note: the following trait must be implemented
+note: the trait `Div` must be implemented
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL | pub trait Div<Rhs = Self> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0369]: cannot mod `A` by `A`
   --> $DIR/issue-28837.rs:14:7
@@ -87,11 +75,8 @@ note: an implementation of `Rem<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^ must implement `Rem<_>`
-note: the following trait must be implemented
+note: the trait `Rem` must be implemented
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL | pub trait Rem<Rhs = Self> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0369]: no implementation for `A & A`
   --> $DIR/issue-28837.rs:16:7
@@ -106,11 +91,8 @@ note: an implementation of `BitAnd<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^ must implement `BitAnd<_>`
-note: the following trait must be implemented
+note: the trait `BitAnd` must be implemented
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
-   |
-LL | pub trait BitAnd<Rhs = Self> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0369]: no implementation for `A | A`
   --> $DIR/issue-28837.rs:18:7
@@ -125,11 +107,8 @@ note: an implementation of `BitOr<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^ must implement `BitOr<_>`
-note: the following trait must be implemented
+note: the trait `BitOr` must be implemented
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
-   |
-LL | pub trait BitOr<Rhs = Self> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0369]: no implementation for `A << A`
   --> $DIR/issue-28837.rs:20:7
@@ -144,11 +123,8 @@ note: an implementation of `Shl<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^ must implement `Shl<_>`
-note: the following trait must be implemented
+note: the trait `Shl` must be implemented
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
-   |
-LL | pub trait Shl<Rhs = Self> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0369]: no implementation for `A >> A`
   --> $DIR/issue-28837.rs:22:7
@@ -163,11 +139,8 @@ note: an implementation of `Shr<_>` might be missing for `A`
    |
 LL | struct A;
    | ^^^^^^^^ must implement `Shr<_>`
-note: the following trait must be implemented
+note: the trait `Shr` must be implemented
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
-   |
-LL | pub trait Shr<Rhs = Self> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0369]: binary operation `==` cannot be applied to type `A`
   --> $DIR/issue-28837.rs:24:7
diff --git a/src/test/ui/binop/issue-3820.rs b/tests/ui/binop/issue-3820.rs
index b987a90b2..b987a90b2 100644
--- a/src/test/ui/binop/issue-3820.rs
+++ b/tests/ui/binop/issue-3820.rs
diff --git a/src/test/ui/binop/issue-3820.stderr b/tests/ui/binop/issue-3820.stderr
index f21f89069..c313ed603 100644
--- a/src/test/ui/binop/issue-3820.stderr
+++ b/tests/ui/binop/issue-3820.stderr
@@ -11,11 +11,8 @@ note: an implementation of `Mul<_>` might be missing for `Thing`
    |
 LL | struct Thing {
    | ^^^^^^^^^^^^ must implement `Mul<_>`
-note: the following trait must be implemented
+note: the trait `Mul` must be implemented
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL | pub trait Mul<Rhs = Self> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/binop/issue-77910-1.rs b/tests/ui/binop/issue-77910-1.rs
index 95bbd6a60..95bbd6a60 100644
--- a/src/test/ui/binop/issue-77910-1.rs
+++ b/tests/ui/binop/issue-77910-1.rs
diff --git a/src/test/ui/binop/issue-77910-1.stderr b/tests/ui/binop/issue-77910-1.stderr
index 263a35d98..263a35d98 100644
--- a/src/test/ui/binop/issue-77910-1.stderr
+++ b/tests/ui/binop/issue-77910-1.stderr
diff --git a/src/test/ui/binop/issue-77910-2.rs b/tests/ui/binop/issue-77910-2.rs
index 2bb48d365..2bb48d365 100644
--- a/src/test/ui/binop/issue-77910-2.rs
+++ b/tests/ui/binop/issue-77910-2.rs
diff --git a/src/test/ui/binop/issue-77910-2.stderr b/tests/ui/binop/issue-77910-2.stderr
index b3856b6ae..b3856b6ae 100644
--- a/src/test/ui/binop/issue-77910-2.stderr
+++ b/tests/ui/binop/issue-77910-2.stderr
diff --git a/src/test/ui/binop/issue-93927.rs b/tests/ui/binop/issue-93927.rs
index de27c9785..de27c9785 100644
--- a/src/test/ui/binop/issue-93927.rs
+++ b/tests/ui/binop/issue-93927.rs
diff --git a/src/test/ui/binop/issue-93927.stderr b/tests/ui/binop/issue-93927.stderr
index 75558b502..75558b502 100644
--- a/src/test/ui/binop/issue-93927.stderr
+++ b/tests/ui/binop/issue-93927.stderr
diff --git a/src/test/ui/binop/operator-multidispatch.rs b/tests/ui/binop/operator-multidispatch.rs
index 0d1dcfd8b..0d1dcfd8b 100644
--- a/src/test/ui/binop/operator-multidispatch.rs
+++ b/tests/ui/binop/operator-multidispatch.rs
diff --git a/src/test/ui/binop/operator-overloading.rs b/tests/ui/binop/operator-overloading.rs
index 6b3abcbc7..6b3abcbc7 100644
--- a/src/test/ui/binop/operator-overloading.rs
+++ b/tests/ui/binop/operator-overloading.rs
diff --git a/src/test/ui/binop/placement-syntax.rs b/tests/ui/binop/placement-syntax.rs
index 4df96dedb..4df96dedb 100644
--- a/src/test/ui/binop/placement-syntax.rs
+++ b/tests/ui/binop/placement-syntax.rs
diff --git a/src/test/ui/binop/placement-syntax.stderr b/tests/ui/binop/placement-syntax.stderr
index 3fdaf4cd0..3fdaf4cd0 100644
--- a/src/test/ui/binop/placement-syntax.stderr
+++ b/tests/ui/binop/placement-syntax.stderr
diff --git a/src/test/ui/binop/shift-various-bad-types.rs b/tests/ui/binop/shift-various-bad-types.rs
index 31224bbca..31224bbca 100644
--- a/src/test/ui/binop/shift-various-bad-types.rs
+++ b/tests/ui/binop/shift-various-bad-types.rs
diff --git a/src/test/ui/binop/shift-various-bad-types.stderr b/tests/ui/binop/shift-various-bad-types.stderr
index 38db66f86..38db66f86 100644
--- a/src/test/ui/binop/shift-various-bad-types.stderr
+++ b/tests/ui/binop/shift-various-bad-types.stderr
diff --git a/src/test/ui/binop/structured-compare.rs b/tests/ui/binop/structured-compare.rs
index 63d30c4da..63d30c4da 100644
--- a/src/test/ui/binop/structured-compare.rs
+++ b/tests/ui/binop/structured-compare.rs