23 files changed, 1 insertions, 4 deletions
diff --git a/src/test/ui/destructuring-assignment/bad-expr-lhs.rs b/tests/ui/destructuring-assignment/bad-expr-lhs.rs
index 53794783a..53794783a 100644
--- a/src/test/ui/destructuring-assignment/bad-expr-lhs.rs
+++ b/tests/ui/destructuring-assignment/bad-expr-lhs.rs
diff --git a/src/test/ui/destructuring-assignment/bad-expr-lhs.stderr b/tests/ui/destructuring-assignment/bad-expr-lhs.stderr
index d29867474..d29867474 100644
--- a/src/test/ui/destructuring-assignment/bad-expr-lhs.stderr
+++ b/tests/ui/destructuring-assignment/bad-expr-lhs.stderr
diff --git a/src/test/ui/destructuring-assignment/default-match-bindings-forbidden.rs b/tests/ui/destructuring-assignment/default-match-bindings-forbidden.rs
index ff867c000..ff867c000 100644
--- a/src/test/ui/destructuring-assignment/default-match-bindings-forbidden.rs
+++ b/tests/ui/destructuring-assignment/default-match-bindings-forbidden.rs
diff --git a/src/test/ui/destructuring-assignment/default-match-bindings-forbidden.stderr b/tests/ui/destructuring-assignment/default-match-bindings-forbidden.stderr
index 950e0223e..950e0223e 100644
--- a/src/test/ui/destructuring-assignment/default-match-bindings-forbidden.stderr
+++ b/tests/ui/destructuring-assignment/default-match-bindings-forbidden.stderr
diff --git a/src/test/ui/destructuring-assignment/drop-order.rs b/tests/ui/destructuring-assignment/drop-order.rs
index 79671054c..79671054c 100644
--- a/src/test/ui/destructuring-assignment/drop-order.rs
+++ b/tests/ui/destructuring-assignment/drop-order.rs
diff --git a/src/test/ui/destructuring-assignment/nested_destructure.rs b/tests/ui/destructuring-assignment/nested_destructure.rs
index 94b3a5ff9..94b3a5ff9 100644
--- a/src/test/ui/destructuring-assignment/nested_destructure.rs
+++ b/tests/ui/destructuring-assignment/nested_destructure.rs
diff --git a/src/test/ui/destructuring-assignment/note-unsupported.rs b/tests/ui/destructuring-assignment/note-unsupported.rs
index c69edd421..c69edd421 100644
--- a/src/test/ui/destructuring-assignment/note-unsupported.rs
+++ b/tests/ui/destructuring-assignment/note-unsupported.rs
diff --git a/src/test/ui/destructuring-assignment/note-unsupported.stderr b/tests/ui/destructuring-assignment/note-unsupported.stderr
index e45344aa5..8a88332b7 100644
--- a/src/test/ui/destructuring-assignment/note-unsupported.stderr
+++ b/tests/ui/destructuring-assignment/note-unsupported.stderr
@@ -49,11 +49,8 @@ note: an implementation of `AddAssign<_>` might be missing for `S`
    |
 LL | struct S { x: u8, y: u8 }
    | ^^^^^^^^ must implement `AddAssign<_>`
-note: the following trait must be implemented
+note: the trait `AddAssign` must be implemented
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
-   |
-LL | pub trait AddAssign<Rhs = Self> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0067]: invalid left-hand side of assignment
   --> $DIR/note-unsupported.rs:17:22
diff --git a/src/test/ui/destructuring-assignment/slice_destructure.rs b/tests/ui/destructuring-assignment/slice_destructure.rs
index 762c4b5e8..762c4b5e8 100644
--- a/src/test/ui/destructuring-assignment/slice_destructure.rs
+++ b/tests/ui/destructuring-assignment/slice_destructure.rs
diff --git a/src/test/ui/destructuring-assignment/slice_destructure_fail.rs b/tests/ui/destructuring-assignment/slice_destructure_fail.rs
index 33b09eb34..33b09eb34 100644
--- a/src/test/ui/destructuring-assignment/slice_destructure_fail.rs
+++ b/tests/ui/destructuring-assignment/slice_destructure_fail.rs
diff --git a/src/test/ui/destructuring-assignment/slice_destructure_fail.stderr b/tests/ui/destructuring-assignment/slice_destructure_fail.stderr
index 92c86feba..92c86feba 100644
--- a/src/test/ui/destructuring-assignment/slice_destructure_fail.stderr
+++ b/tests/ui/destructuring-assignment/slice_destructure_fail.stderr
diff --git a/src/test/ui/destructuring-assignment/struct-or-enum-variant-path.rs b/tests/ui/destructuring-assignment/struct-or-enum-variant-path.rs
index 8da7f90c5..8da7f90c5 100644
--- a/src/test/ui/destructuring-assignment/struct-or-enum-variant-path.rs
+++ b/tests/ui/destructuring-assignment/struct-or-enum-variant-path.rs
diff --git a/src/test/ui/destructuring-assignment/struct_destructure.rs b/tests/ui/destructuring-assignment/struct_destructure.rs
index 8cceaadd7..8cceaadd7 100644
--- a/src/test/ui/destructuring-assignment/struct_destructure.rs
+++ b/tests/ui/destructuring-assignment/struct_destructure.rs
diff --git a/src/test/ui/destructuring-assignment/struct_destructure_fail.rs b/tests/ui/destructuring-assignment/struct_destructure_fail.rs
index c001fccd4..c001fccd4 100644
--- a/src/test/ui/destructuring-assignment/struct_destructure_fail.rs
+++ b/tests/ui/destructuring-assignment/struct_destructure_fail.rs
diff --git a/src/test/ui/destructuring-assignment/struct_destructure_fail.stderr b/tests/ui/destructuring-assignment/struct_destructure_fail.stderr
index ae7b3d1e5..ae7b3d1e5 100644
--- a/src/test/ui/destructuring-assignment/struct_destructure_fail.stderr
+++ b/tests/ui/destructuring-assignment/struct_destructure_fail.stderr
diff --git a/src/test/ui/destructuring-assignment/tuple_destructure.rs b/tests/ui/destructuring-assignment/tuple_destructure.rs
index 2a8584029..2a8584029 100644
--- a/src/test/ui/destructuring-assignment/tuple_destructure.rs
+++ b/tests/ui/destructuring-assignment/tuple_destructure.rs
diff --git a/src/test/ui/destructuring-assignment/tuple_destructure_fail.rs b/tests/ui/destructuring-assignment/tuple_destructure_fail.rs
index 4e3172d19..4e3172d19 100644
--- a/src/test/ui/destructuring-assignment/tuple_destructure_fail.rs
+++ b/tests/ui/destructuring-assignment/tuple_destructure_fail.rs
diff --git a/src/test/ui/destructuring-assignment/tuple_destructure_fail.stderr b/tests/ui/destructuring-assignment/tuple_destructure_fail.stderr
index a3004cbbe..a3004cbbe 100644
--- a/src/test/ui/destructuring-assignment/tuple_destructure_fail.stderr
+++ b/tests/ui/destructuring-assignment/tuple_destructure_fail.stderr
diff --git a/src/test/ui/destructuring-assignment/tuple_struct_destructure.rs b/tests/ui/destructuring-assignment/tuple_struct_destructure.rs
index 07b5f7a31..07b5f7a31 100644
--- a/src/test/ui/destructuring-assignment/tuple_struct_destructure.rs
+++ b/tests/ui/destructuring-assignment/tuple_struct_destructure.rs
diff --git a/src/test/ui/destructuring-assignment/tuple_struct_destructure_fail.rs b/tests/ui/destructuring-assignment/tuple_struct_destructure_fail.rs
index 845f867d7..845f867d7 100644
--- a/src/test/ui/destructuring-assignment/tuple_struct_destructure_fail.rs
+++ b/tests/ui/destructuring-assignment/tuple_struct_destructure_fail.rs
diff --git a/src/test/ui/destructuring-assignment/tuple_struct_destructure_fail.stderr b/tests/ui/destructuring-assignment/tuple_struct_destructure_fail.stderr
index 5cc7acba3..5cc7acba3 100644
--- a/src/test/ui/destructuring-assignment/tuple_struct_destructure_fail.stderr
+++ b/tests/ui/destructuring-assignment/tuple_struct_destructure_fail.stderr
diff --git a/src/test/ui/destructuring-assignment/warn-unused-duplication.rs b/tests/ui/destructuring-assignment/warn-unused-duplication.rs
index 390f44b8a..390f44b8a 100644
--- a/src/test/ui/destructuring-assignment/warn-unused-duplication.rs
+++ b/tests/ui/destructuring-assignment/warn-unused-duplication.rs
diff --git a/src/test/ui/destructuring-assignment/warn-unused-duplication.stderr b/tests/ui/destructuring-assignment/warn-unused-duplication.stderr
index e16625136..e16625136 100644
--- a/src/test/ui/destructuring-assignment/warn-unused-duplication.stderr
+++ b/tests/ui/destructuring-assignment/warn-unused-duplication.stderr