Adding upstream version 1.68.2+dfsg1.upstream/1.68.2+dfsg1

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

193 files changed, 323 insertions, 18 deletions

diff --git a/src/test/ui/span/E0046.rs b/tests/ui/span/E0046.rs
index 961109892..961109892 100644
--- a/src/test/ui/span/E0046.rs
+++ b/tests/ui/span/E0046.rs
diff --git a/src/test/ui/span/E0046.stderr b/tests/ui/span/E0046.stderr
index 1323524f2..1323524f2 100644
--- a/src/test/ui/span/E0046.stderr
+++ b/tests/ui/span/E0046.stderr
diff --git a/src/test/ui/span/E0072.rs b/tests/ui/span/E0072.rs
index bc284cdcb..bc284cdcb 100644
--- a/src/test/ui/span/E0072.rs
+++ b/tests/ui/span/E0072.rs
diff --git a/src/test/ui/span/E0072.stderr b/tests/ui/span/E0072.stderr
index 20f2e0df0..20f2e0df0 100644
--- a/src/test/ui/span/E0072.stderr
+++ b/tests/ui/span/E0072.stderr
diff --git a/src/test/ui/span/E0204.rs b/tests/ui/span/E0204.rs
index 174de8cdd..174de8cdd 100644
--- a/src/test/ui/span/E0204.rs
+++ b/tests/ui/span/E0204.rs
diff --git a/src/test/ui/span/E0204.stderr b/tests/ui/span/E0204.stderr
index 0b2166eed..0b2166eed 100644
--- a/src/test/ui/span/E0204.stderr
+++ b/tests/ui/span/E0204.stderr
diff --git a/src/test/ui/span/E0493.rs b/tests/ui/span/E0493.rs
index 625da25a7..625da25a7 100644
--- a/src/test/ui/span/E0493.rs
+++ b/tests/ui/span/E0493.rs
diff --git a/src/test/ui/span/E0493.stderr b/tests/ui/span/E0493.stderr
index 9db627562..9db627562 100644
--- a/src/test/ui/span/E0493.stderr
+++ b/tests/ui/span/E0493.stderr
diff --git a/src/test/ui/span/E0535.rs b/tests/ui/span/E0535.rs
index e26334e9b..e26334e9b 100644
--- a/src/test/ui/span/E0535.rs
+++ b/tests/ui/span/E0535.rs
diff --git a/src/test/ui/span/E0535.stderr b/tests/ui/span/E0535.stderr
index b1411bc43..b1411bc43 100644
--- a/src/test/ui/span/E0535.stderr
+++ b/tests/ui/span/E0535.stderr
diff --git a/src/test/ui/span/E0536.rs b/tests/ui/span/E0536.rs
index 72de7b6f4..72de7b6f4 100644
--- a/src/test/ui/span/E0536.rs
+++ b/tests/ui/span/E0536.rs
diff --git a/src/test/ui/span/E0536.stderr b/tests/ui/span/E0536.stderr
index 820b0d744..820b0d744 100644
--- a/src/test/ui/span/E0536.stderr
+++ b/tests/ui/span/E0536.stderr
diff --git a/src/test/ui/span/E0537.rs b/tests/ui/span/E0537.rs
index 4088a9ae5..4088a9ae5 100644
--- a/src/test/ui/span/E0537.rs
+++ b/tests/ui/span/E0537.rs
diff --git a/src/test/ui/span/E0537.stderr b/tests/ui/span/E0537.stderr
index 5478c3fbc..5478c3fbc 100644
--- a/src/test/ui/span/E0537.stderr
+++ b/tests/ui/span/E0537.stderr
diff --git a/src/test/ui/span/auxiliary/transitive_dep_three.rs b/tests/ui/span/auxiliary/transitive_dep_three.rs
index 99b51625a..99b51625a 100644
--- a/src/test/ui/span/auxiliary/transitive_dep_three.rs
+++ b/tests/ui/span/auxiliary/transitive_dep_three.rs
diff --git a/src/test/ui/span/auxiliary/transitive_dep_two.rs b/tests/ui/span/auxiliary/transitive_dep_two.rs
index 5110c4276..5110c4276 100644
--- a/src/test/ui/span/auxiliary/transitive_dep_two.rs
+++ b/tests/ui/span/auxiliary/transitive_dep_two.rs
diff --git a/src/test/ui/span/borrowck-borrow-overloaded-auto-deref-mut.rs b/tests/ui/span/borrowck-borrow-overloaded-auto-deref-mut.rs
index 76a1d12ea..76a1d12ea 100644
--- a/src/test/ui/span/borrowck-borrow-overloaded-auto-deref-mut.rs
+++ b/tests/ui/span/borrowck-borrow-overloaded-auto-deref-mut.rs
diff --git a/tests/ui/span/borrowck-borrow-overloaded-auto-deref-mut.stderr b/tests/ui/span/borrowck-borrow-overloaded-auto-deref-mut.stderr
new file mode 100644
index 000000000..570328fc2
--- /dev/null
+++ b/tests/ui/span/borrowck-borrow-overloaded-auto-deref-mut.stderr
@@ -0,0 +1,112 @@
+error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
+  --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:53:24
+   |
+LL |     let __isize = &mut x.y;
+   |                        ^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL | fn deref_mut_field1(mut x: Own<Point>) {
+   |                     +++
+
+error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
+  --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:65:10
+   |
+LL |     &mut x.y
+   |          ^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn deref_extend_mut_field1(x: &mut Own<Point>) -> &mut isize {
+   |                               ~~~~~~~~~~~~~~~
+
+error[E0499]: cannot borrow `*x` as mutable more than once at a time
+  --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:78:19
+   |
+LL |     let _x = &mut x.x;
+   |                   - first mutable borrow occurs here
+LL |     let _y = &mut x.y;
+   |                   ^ second mutable borrow occurs here
+LL |     use_mut(_x);
+   |             -- first borrow later used here
+
+error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
+  --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:88:5
+   |
+LL |     x.y = 3;
+   |     ^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL | fn assign_field1<'a>(mut x: Own<Point>) {
+   |                      +++
+
+error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
+  --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:92:5
+   |
+LL |     x.y = 3;
+   |     ^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn assign_field2<'a>(x: &'a mut Own<Point>) {
+   |                         ~~~~~~~~~~~~~~~~~~
+
+error[E0499]: cannot borrow `*x` as mutable more than once at a time
+  --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:101:5
+   |
+LL |     let _p: &mut Point = &mut **x;
+   |                                -- first mutable borrow occurs here
+LL |     x.y = 3;
+   |     ^ second mutable borrow occurs here
+LL |     use_mut(_p);
+   |             -- first borrow later used here
+
+error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
+  --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:109:5
+   |
+LL |     x.set(0, 0);
+   |     ^^^^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL | fn deref_mut_method1(mut x: Own<Point>) {
+   |                      +++
+
+error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
+  --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:121:5
+   |
+LL |     x.y_mut()
+   |     ^^^^^^^^^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn deref_extend_mut_method1(x: &mut Own<Point>) -> &mut isize {
+   |                                ~~~~~~~~~~~~~~~
+
+error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
+  --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:129:6
+   |
+LL |     *x.y_mut() = 3;
+   |      ^^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL | fn assign_method1<'a>(mut x: Own<Point>) {
+   |                       +++
+
+error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
+  --> $DIR/borrowck-borrow-overloaded-auto-deref-mut.rs:133:6
+   |
+LL |     *x.y_mut() = 3;
+   |      ^^^^^^^^^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn assign_method2<'a>(x: &'a mut Own<Point>) {
+   |                          ~~~~~~~~~~~~~~~~~~
+
+error: aborting due to 10 previous errors
+
+Some errors have detailed explanations: E0499, E0596.
+For more information about an error, try `rustc --explain E0499`.
diff --git a/src/test/ui/span/borrowck-borrow-overloaded-deref-mut.rs b/tests/ui/span/borrowck-borrow-overloaded-deref-mut.rs
index 8d43d5da4..8d43d5da4 100644
--- a/src/test/ui/span/borrowck-borrow-overloaded-deref-mut.rs
+++ b/tests/ui/span/borrowck-borrow-overloaded-deref-mut.rs
diff --git a/tests/ui/span/borrowck-borrow-overloaded-deref-mut.stderr b/tests/ui/span/borrowck-borrow-overloaded-deref-mut.stderr
new file mode 100644
index 000000000..3fed7b3f4
--- /dev/null
+++ b/tests/ui/span/borrowck-borrow-overloaded-deref-mut.stderr
@@ -0,0 +1,47 @@
+error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
+  --> $DIR/borrowck-borrow-overloaded-deref-mut.rs:29:25
+   |
+LL |     let __isize = &mut *x;
+   |                         ^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL | fn deref_mut1(mut x: Own<isize>) {
+   |               +++
+
+error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
+  --> $DIR/borrowck-borrow-overloaded-deref-mut.rs:41:11
+   |
+LL |     &mut **x
+   |           ^^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn deref_extend_mut1<'a>(x: &'a mut Own<isize>) -> &'a mut isize {
+   |                             ~~~~~~~~~~~~~~~~~~
+
+error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
+  --> $DIR/borrowck-borrow-overloaded-deref-mut.rs:49:6
+   |
+LL |     *x = 3;
+   |      ^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL | fn assign1<'a>(mut x: Own<isize>) {
+   |                +++
+
+error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
+  --> $DIR/borrowck-borrow-overloaded-deref-mut.rs:53:6
+   |
+LL |     **x = 3;
+   |      ^^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn assign2<'a>(x: &'a mut Own<isize>) {
+   |                   ~~~~~~~~~~~~~~~~~~
+
+error: aborting due to 4 previous errors
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/span/borrowck-call-is-borrow-issue-12224.rs b/tests/ui/span/borrowck-call-is-borrow-issue-12224.rs
index 938fdaf11..938fdaf11 100644
--- a/src/test/ui/span/borrowck-call-is-borrow-issue-12224.rs
+++ b/tests/ui/span/borrowck-call-is-borrow-issue-12224.rs
diff --git a/src/test/ui/span/borrowck-call-is-borrow-issue-12224.stderr b/tests/ui/span/borrowck-call-is-borrow-issue-12224.stderr
index 6b43801b5..48b42bc78 100644
--- a/src/test/ui/span/borrowck-call-is-borrow-issue-12224.stderr
+++ b/tests/ui/span/borrowck-call-is-borrow-issue-12224.stderr
@@ -13,18 +13,24 @@ LL |         f((Box::new(|| {})))
 error[E0596]: cannot borrow `*f` as mutable, as it is behind a `&` reference
   --> $DIR/borrowck-call-is-borrow-issue-12224.rs:25:5
    |
-LL | fn test2<F>(f: &F) where F: FnMut() {
-   |                -- help: consider changing this to be a mutable reference: `&mut F`
 LL |     (*f)();
    |     ^^^^ `f` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn test2<F>(f: &mut F) where F: FnMut() {
+   |                ~~~~~~
 
 error[E0596]: cannot borrow `f.f` as mutable, as it is behind a `&` reference
   --> $DIR/borrowck-call-is-borrow-issue-12224.rs:34:5
    |
-LL | fn test4(f: &Test) {
-   |             ----- help: consider changing this to be a mutable reference: `&mut Test<'_>`
 LL |     f.f.call_mut(())
    |     ^^^^^^^^^^^^^^^^ `f` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn test4(f: &mut Test<'_>) {
+   |             ~~~~~~~~~~~~~
 
 error[E0507]: cannot move out of `f`, a captured variable in an `FnMut` closure
   --> $DIR/borrowck-call-is-borrow-issue-12224.rs:57:13
diff --git a/src/test/ui/span/borrowck-call-method-from-mut-aliasable.rs b/tests/ui/span/borrowck-call-method-from-mut-aliasable.rs
index caf2d2a55..caf2d2a55 100644
--- a/src/test/ui/span/borrowck-call-method-from-mut-aliasable.rs
+++ b/tests/ui/span/borrowck-call-method-from-mut-aliasable.rs
diff --git a/tests/ui/span/borrowck-call-method-from-mut-aliasable.stderr b/tests/ui/span/borrowck-call-method-from-mut-aliasable.stderr
new file mode 100644
index 000000000..2a842f5a2
--- /dev/null
+++ b/tests/ui/span/borrowck-call-method-from-mut-aliasable.stderr
@@ -0,0 +1,14 @@
+error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
+  --> $DIR/borrowck-call-method-from-mut-aliasable.rs:17:5
+   |
+LL |     x.h();
+   |     ^^^^^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn b(x: &mut Foo) {
+   |         ~~~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/span/borrowck-fn-in-const-b.rs b/tests/ui/span/borrowck-fn-in-const-b.rs
index 822083efe..822083efe 100644
--- a/src/test/ui/span/borrowck-fn-in-const-b.rs
+++ b/tests/ui/span/borrowck-fn-in-const-b.rs
diff --git a/tests/ui/span/borrowck-fn-in-const-b.stderr b/tests/ui/span/borrowck-fn-in-const-b.stderr
new file mode 100644
index 000000000..1df19deb1
--- /dev/null
+++ b/tests/ui/span/borrowck-fn-in-const-b.stderr
@@ -0,0 +1,14 @@
+error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
+  --> $DIR/borrowck-fn-in-const-b.rs:7:9
+   |
+LL |         x.push(format!("this is broken"));
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     fn broken(x: &mut Vec<String>) {
+   |                  ~~~~~~~~~~~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/span/borrowck-let-suggestion-suffixes.rs b/tests/ui/span/borrowck-let-suggestion-suffixes.rs
index 18abfb5c3..18abfb5c3 100644
--- a/src/test/ui/span/borrowck-let-suggestion-suffixes.rs
+++ b/tests/ui/span/borrowck-let-suggestion-suffixes.rs
diff --git a/src/test/ui/span/borrowck-let-suggestion-suffixes.stderr b/tests/ui/span/borrowck-let-suggestion-suffixes.stderr
index 2dc29a78d..2dc29a78d 100644
--- a/src/test/ui/span/borrowck-let-suggestion-suffixes.stderr
+++ b/tests/ui/span/borrowck-let-suggestion-suffixes.stderr
diff --git a/src/test/ui/span/borrowck-object-mutability.rs b/tests/ui/span/borrowck-object-mutability.rs
index f5adc2cc1..f5adc2cc1 100644
--- a/src/test/ui/span/borrowck-object-mutability.rs
+++ b/tests/ui/span/borrowck-object-mutability.rs
diff --git a/tests/ui/span/borrowck-object-mutability.stderr b/tests/ui/span/borrowck-object-mutability.stderr
new file mode 100644
index 000000000..b6517e0b3
--- /dev/null
+++ b/tests/ui/span/borrowck-object-mutability.stderr
@@ -0,0 +1,25 @@
+error[E0596]: cannot borrow `*x` as mutable, as it is behind a `&` reference
+  --> $DIR/borrowck-object-mutability.rs:8:5
+   |
+LL |     x.borrowed_mut();
+   |     ^^^^^^^^^^^^^^^^ `x` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | fn borrowed_receiver(x: &mut dyn Foo) {
+   |                         ~~~~~~~~~~~~
+
+error[E0596]: cannot borrow `*x` as mutable, as `x` is not declared as mutable
+  --> $DIR/borrowck-object-mutability.rs:18:5
+   |
+LL |     x.borrowed_mut();
+   |     ^^^^^^^^^^^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL | fn owned_receiver(mut x: Box<dyn Foo>) {
+   |                   +++
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/span/borrowck-ref-into-rvalue.fixed b/tests/ui/span/borrowck-ref-into-rvalue.fixed
index 51f65e534..51f65e534 100644
--- a/src/test/ui/span/borrowck-ref-into-rvalue.fixed
+++ b/tests/ui/span/borrowck-ref-into-rvalue.fixed
diff --git a/src/test/ui/span/borrowck-ref-into-rvalue.rs b/tests/ui/span/borrowck-ref-into-rvalue.rs
index 7b09fad92..7b09fad92 100644
--- a/src/test/ui/span/borrowck-ref-into-rvalue.rs
+++ b/tests/ui/span/borrowck-ref-into-rvalue.rs
diff --git a/src/test/ui/span/borrowck-ref-into-rvalue.stderr b/tests/ui/span/borrowck-ref-into-rvalue.stderr
index 25e344fed..25e344fed 100644
--- a/src/test/ui/span/borrowck-ref-into-rvalue.stderr
+++ b/tests/ui/span/borrowck-ref-into-rvalue.stderr
diff --git a/src/test/ui/span/coerce-suggestions.rs b/tests/ui/span/coerce-suggestions.rs
index 7920ae0b2..7920ae0b2 100644
--- a/src/test/ui/span/coerce-suggestions.rs
+++ b/tests/ui/span/coerce-suggestions.rs
diff --git a/src/test/ui/span/coerce-suggestions.stderr b/tests/ui/span/coerce-suggestions.stderr
index db784d5fe..db784d5fe 100644
--- a/src/test/ui/span/coerce-suggestions.stderr
+++ b/tests/ui/span/coerce-suggestions.stderr
diff --git a/src/test/ui/span/destructor-restrictions.rs b/tests/ui/span/destructor-restrictions.rs
index 7fb348a14..7fb348a14 100644
--- a/src/test/ui/span/destructor-restrictions.rs
+++ b/tests/ui/span/destructor-restrictions.rs
diff --git a/src/test/ui/span/destructor-restrictions.stderr b/tests/ui/span/destructor-restrictions.stderr
index 53c940462..53c940462 100644
--- a/src/test/ui/span/destructor-restrictions.stderr
+++ b/tests/ui/span/destructor-restrictions.stderr
diff --git a/src/test/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-93117.rs b/tests/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-93117.rs
index 4559da91e..4559da91e 100644
--- a/src/test/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-93117.rs
+++ b/tests/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-93117.rs
diff --git a/src/test/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-93117.stderr b/tests/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-93117.stderr
index df1cafdb7..df1cafdb7 100644
--- a/src/test/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-93117.stderr
+++ b/tests/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-93117.stderr
diff --git a/src/test/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-96258.rs b/tests/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-96258.rs
index a776e5089..a776e5089 100644
--- a/src/test/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-96258.rs
+++ b/tests/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-96258.rs
diff --git a/src/test/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-96258.stderr b/tests/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-96258.stderr
index 37b2f4138..37b2f4138 100644
--- a/src/test/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-96258.stderr
+++ b/tests/ui/span/drop-location-span-error-rust-2021-incompatible-closure-captures-96258.stderr
diff --git a/src/test/ui/span/dropck-object-cycle.rs b/tests/ui/span/dropck-object-cycle.rs
index a26123d52..a26123d52 100644
--- a/src/test/ui/span/dropck-object-cycle.rs
+++ b/tests/ui/span/dropck-object-cycle.rs
diff --git a/src/test/ui/span/dropck-object-cycle.stderr b/tests/ui/span/dropck-object-cycle.stderr
index 229d17e1c..229d17e1c 100644
--- a/src/test/ui/span/dropck-object-cycle.stderr
+++ b/tests/ui/span/dropck-object-cycle.stderr
diff --git a/src/test/ui/span/dropck_arr_cycle_checked.rs b/tests/ui/span/dropck_arr_cycle_checked.rs
index a14db5ff0..a14db5ff0 100644
--- a/src/test/ui/span/dropck_arr_cycle_checked.rs
+++ b/tests/ui/span/dropck_arr_cycle_checked.rs
diff --git a/src/test/ui/span/dropck_arr_cycle_checked.stderr b/tests/ui/span/dropck_arr_cycle_checked.stderr
index 068c779ae..068c779ae 100644
--- a/src/test/ui/span/dropck_arr_cycle_checked.stderr
+++ b/tests/ui/span/dropck_arr_cycle_checked.stderr
diff --git a/src/test/ui/span/dropck_direct_cycle_with_drop.rs b/tests/ui/span/dropck_direct_cycle_with_drop.rs
index 14d6e6654..14d6e6654 100644
--- a/src/test/ui/span/dropck_direct_cycle_with_drop.rs
+++ b/tests/ui/span/dropck_direct_cycle_with_drop.rs
diff --git a/src/test/ui/span/dropck_direct_cycle_with_drop.stderr b/tests/ui/span/dropck_direct_cycle_with_drop.stderr
index 07ae138ac..07ae138ac 100644
--- a/src/test/ui/span/dropck_direct_cycle_with_drop.stderr
+++ b/tests/ui/span/dropck_direct_cycle_with_drop.stderr
diff --git a/src/test/ui/span/dropck_misc_variants.rs b/tests/ui/span/dropck_misc_variants.rs
index 5818a94bc..5818a94bc 100644
--- a/src/test/ui/span/dropck_misc_variants.rs
+++ b/tests/ui/span/dropck_misc_variants.rs
diff --git a/src/test/ui/span/dropck_misc_variants.stderr b/tests/ui/span/dropck_misc_variants.stderr
index 76e90574c..76e90574c 100644
--- a/src/test/ui/span/dropck_misc_variants.stderr
+++ b/tests/ui/span/dropck_misc_variants.stderr
diff --git a/src/test/ui/span/dropck_vec_cycle_checked.rs b/tests/ui/span/dropck_vec_cycle_checked.rs
index c5d21507d..c5d21507d 100644
--- a/src/test/ui/span/dropck_vec_cycle_checked.rs
+++ b/tests/ui/span/dropck_vec_cycle_checked.rs
diff --git a/src/test/ui/span/dropck_vec_cycle_checked.stderr b/tests/ui/span/dropck_vec_cycle_checked.stderr
index 7ff991c0c..7ff991c0c 100644
--- a/src/test/ui/span/dropck_vec_cycle_checked.stderr
+++ b/tests/ui/span/dropck_vec_cycle_checked.stderr
diff --git a/src/test/ui/span/gated-features-attr-spans.rs b/tests/ui/span/gated-features-attr-spans.rs
index 69511ab8e..69511ab8e 100644
--- a/src/test/ui/span/gated-features-attr-spans.rs
+++ b/tests/ui/span/gated-features-attr-spans.rs
diff --git a/src/test/ui/span/gated-features-attr-spans.stderr b/tests/ui/span/gated-features-attr-spans.stderr
index c8b8f346b..c8b8f346b 100644
--- a/src/test/ui/span/gated-features-attr-spans.stderr
+++ b/tests/ui/span/gated-features-attr-spans.stderr
diff --git a/src/test/ui/span/impl-wrong-item-for-trait.rs b/tests/ui/span/impl-wrong-item-for-trait.rs
index bf3358686..bf3358686 100644
--- a/src/test/ui/span/impl-wrong-item-for-trait.rs
+++ b/tests/ui/span/impl-wrong-item-for-trait.rs
diff --git a/src/test/ui/span/impl-wrong-item-for-trait.stderr b/tests/ui/span/impl-wrong-item-for-trait.stderr
index f919092f9..f919092f9 100644
--- a/src/test/ui/span/impl-wrong-item-for-trait.stderr
+++ b/tests/ui/span/impl-wrong-item-for-trait.stderr
diff --git a/src/test/ui/span/import-ty-params.rs b/tests/ui/span/import-ty-params.rs
index 313cd227b..313cd227b 100644
--- a/src/test/ui/span/import-ty-params.rs
+++ b/tests/ui/span/import-ty-params.rs
diff --git a/src/test/ui/span/import-ty-params.stderr b/tests/ui/span/import-ty-params.stderr
index 701cd0c04..701cd0c04 100644
--- a/src/test/ui/span/import-ty-params.stderr
+++ b/tests/ui/span/import-ty-params.stderr
diff --git a/src/test/ui/span/issue-11925.rs b/tests/ui/span/issue-11925.rs
index cac9fd5bf..cac9fd5bf 100644
--- a/src/test/ui/span/issue-11925.rs
+++ b/tests/ui/span/issue-11925.rs
diff --git a/src/test/ui/span/issue-11925.stderr b/tests/ui/span/issue-11925.stderr
index 1d317fc33..1d317fc33 100644
--- a/src/test/ui/span/issue-11925.stderr
+++ b/tests/ui/span/issue-11925.stderr
diff --git a/src/test/ui/span/issue-15480.fixed b/tests/ui/span/issue-15480.fixed
index e6d1a4dd3..e6d1a4dd3 100644
--- a/src/test/ui/span/issue-15480.fixed
+++ b/tests/ui/span/issue-15480.fixed
diff --git a/src/test/ui/span/issue-15480.rs b/tests/ui/span/issue-15480.rs
index 916ce4b1e..916ce4b1e 100644
--- a/src/test/ui/span/issue-15480.rs
+++ b/tests/ui/span/issue-15480.rs
diff --git a/src/test/ui/span/issue-15480.stderr b/tests/ui/span/issue-15480.stderr
index d9cce2254..d9cce2254 100644
--- a/src/test/ui/span/issue-15480.stderr
+++ b/tests/ui/span/issue-15480.stderr
diff --git a/src/test/ui/span/issue-23338-locals-die-before-temps-of-body.rs b/tests/ui/span/issue-23338-locals-die-before-temps-of-body.rs
index a92ea4ddc..a92ea4ddc 100644
--- a/src/test/ui/span/issue-23338-locals-die-before-temps-of-body.rs
+++ b/tests/ui/span/issue-23338-locals-die-before-temps-of-body.rs
diff --git a/src/test/ui/span/issue-23338-locals-die-before-temps-of-body.stderr b/tests/ui/span/issue-23338-locals-die-before-temps-of-body.stderr
index 3c2022748..3c2022748 100644
--- a/src/test/ui/span/issue-23338-locals-die-before-temps-of-body.stderr
+++ b/tests/ui/span/issue-23338-locals-die-before-temps-of-body.stderr
diff --git a/src/test/ui/span/issue-23729.rs b/tests/ui/span/issue-23729.rs
index ca33f9c77..ca33f9c77 100644
--- a/src/test/ui/span/issue-23729.rs
+++ b/tests/ui/span/issue-23729.rs
diff --git a/src/test/ui/span/issue-23729.stderr b/tests/ui/span/issue-23729.stderr
index f88ce6c88..f88ce6c88 100644
--- a/src/test/ui/span/issue-23729.stderr
+++ b/tests/ui/span/issue-23729.stderr
diff --git a/src/test/ui/span/issue-23827.rs b/tests/ui/span/issue-23827.rs
index 6b065bf6c..6b065bf6c 100644
--- a/src/test/ui/span/issue-23827.rs
+++ b/tests/ui/span/issue-23827.rs
diff --git a/src/test/ui/span/issue-23827.stderr b/tests/ui/span/issue-23827.stderr
index 46a820f1b..46a820f1b 100644
--- a/src/test/ui/span/issue-23827.stderr
+++ b/tests/ui/span/issue-23827.stderr
diff --git a/src/test/ui/span/issue-24356.rs b/tests/ui/span/issue-24356.rs
index 7ec05aab2..7ec05aab2 100644
--- a/src/test/ui/span/issue-24356.rs
+++ b/tests/ui/span/issue-24356.rs
diff --git a/src/test/ui/span/issue-24356.stderr b/tests/ui/span/issue-24356.stderr
index a1f9b2550..a1f9b2550 100644
--- a/src/test/ui/span/issue-24356.stderr
+++ b/tests/ui/span/issue-24356.stderr
diff --git a/src/test/ui/span/issue-24690.rs b/tests/ui/span/issue-24690.rs
index 2b7349c55..2b7349c55 100644
--- a/src/test/ui/span/issue-24690.rs
+++ b/tests/ui/span/issue-24690.rs
diff --git a/src/test/ui/span/issue-24690.stderr b/tests/ui/span/issue-24690.stderr
index 73e166e64..73e166e64 100644
--- a/src/test/ui/span/issue-24690.stderr
+++ b/tests/ui/span/issue-24690.stderr
diff --git a/src/test/ui/span/issue-24805-dropck-child-has-items-via-parent.rs b/tests/ui/span/issue-24805-dropck-child-has-items-via-parent.rs
index 9c772052f..9c772052f 100644
--- a/src/test/ui/span/issue-24805-dropck-child-has-items-via-parent.rs
+++ b/tests/ui/span/issue-24805-dropck-child-has-items-via-parent.rs
diff --git a/src/test/ui/span/issue-24805-dropck-child-has-items-via-parent.stderr b/tests/ui/span/issue-24805-dropck-child-has-items-via-parent.stderr
index 809e60a8c..809e60a8c 100644
--- a/src/test/ui/span/issue-24805-dropck-child-has-items-via-parent.stderr
+++ b/tests/ui/span/issue-24805-dropck-child-has-items-via-parent.stderr
diff --git a/src/test/ui/span/issue-24805-dropck-trait-has-items.rs b/tests/ui/span/issue-24805-dropck-trait-has-items.rs
index b5c410cd3..b5c410cd3 100644
--- a/src/test/ui/span/issue-24805-dropck-trait-has-items.rs
+++ b/tests/ui/span/issue-24805-dropck-trait-has-items.rs
diff --git a/src/test/ui/span/issue-24805-dropck-trait-has-items.stderr b/tests/ui/span/issue-24805-dropck-trait-has-items.stderr
index 2e2170669..2e2170669 100644
--- a/src/test/ui/span/issue-24805-dropck-trait-has-items.stderr
+++ b/tests/ui/span/issue-24805-dropck-trait-has-items.stderr
diff --git a/src/test/ui/span/issue-24895-copy-clone-dropck.rs b/tests/ui/span/issue-24895-copy-clone-dropck.rs
index 904cd8f67..904cd8f67 100644
--- a/src/test/ui/span/issue-24895-copy-clone-dropck.rs
+++ b/tests/ui/span/issue-24895-copy-clone-dropck.rs
diff --git a/src/test/ui/span/issue-24895-copy-clone-dropck.stderr b/tests/ui/span/issue-24895-copy-clone-dropck.stderr
index 18a3dc9e6..18a3dc9e6 100644
--- a/src/test/ui/span/issue-24895-copy-clone-dropck.stderr
+++ b/tests/ui/span/issue-24895-copy-clone-dropck.stderr
diff --git a/src/test/ui/span/issue-25199.rs b/tests/ui/span/issue-25199.rs
index dbc3b1900..dbc3b1900 100644
--- a/src/test/ui/span/issue-25199.rs
+++ b/tests/ui/span/issue-25199.rs
diff --git a/src/test/ui/span/issue-25199.stderr b/tests/ui/span/issue-25199.stderr
index d70a4afc1..d70a4afc1 100644
--- a/src/test/ui/span/issue-25199.stderr
+++ b/tests/ui/span/issue-25199.stderr
diff --git a/src/test/ui/span/issue-26656.rs b/tests/ui/span/issue-26656.rs
index cde68da18..cde68da18 100644
--- a/src/test/ui/span/issue-26656.rs
+++ b/tests/ui/span/issue-26656.rs
diff --git a/src/test/ui/span/issue-26656.stderr b/tests/ui/span/issue-26656.stderr
index 1e939c484..1e939c484 100644
--- a/src/test/ui/span/issue-26656.stderr
+++ b/tests/ui/span/issue-26656.stderr
diff --git a/src/test/ui/span/issue-27522.rs b/tests/ui/span/issue-27522.rs
index 7a0cfb679..7a0cfb679 100644
--- a/src/test/ui/span/issue-27522.rs
+++ b/tests/ui/span/issue-27522.rs
diff --git a/src/test/ui/span/issue-27522.stderr b/tests/ui/span/issue-27522.stderr
index 8a254a968..8a254a968 100644
--- a/src/test/ui/span/issue-27522.stderr
+++ b/tests/ui/span/issue-27522.stderr
diff --git a/src/test/ui/span/issue-29106.rs b/tests/ui/span/issue-29106.rs
index 1be8d4cba..1be8d4cba 100644
--- a/src/test/ui/span/issue-29106.rs
+++ b/tests/ui/span/issue-29106.rs
diff --git a/src/test/ui/span/issue-29106.stderr b/tests/ui/span/issue-29106.stderr
index 71fbd60ee..71fbd60ee 100644
--- a/src/test/ui/span/issue-29106.stderr
+++ b/tests/ui/span/issue-29106.stderr
diff --git a/src/test/ui/span/issue-29595.rs b/tests/ui/span/issue-29595.rs
index 87d7c4cfd..87d7c4cfd 100644
--- a/src/test/ui/span/issue-29595.rs
+++ b/tests/ui/span/issue-29595.rs
diff --git a/src/test/ui/span/issue-29595.stderr b/tests/ui/span/issue-29595.stderr
index 92445e407..92445e407 100644
--- a/src/test/ui/span/issue-29595.stderr
+++ b/tests/ui/span/issue-29595.stderr
diff --git a/src/test/ui/span/issue-33884.rs b/tests/ui/span/issue-33884.rs
index 5d927a5ac..5d927a5ac 100644
--- a/src/test/ui/span/issue-33884.rs
+++ b/tests/ui/span/issue-33884.rs
diff --git a/src/test/ui/span/issue-33884.stderr b/tests/ui/span/issue-33884.stderr
index aee153085..aee153085 100644
--- a/src/test/ui/span/issue-33884.stderr
+++ b/tests/ui/span/issue-33884.stderr
diff --git a/tests/ui/span/issue-34264.rs b/tests/ui/span/issue-34264.rs
new file mode 100644
index 000000000..9227ee482
--- /dev/null
+++ b/tests/ui/span/issue-34264.rs
@@ -0,0 +1,11 @@
+fn foo(Option<i32>, String) {} //~ ERROR expected one of
+//~^ ERROR expected one of
+fn bar(x, y: usize) {} //~ ERROR expected one of
+
+fn main() {
+    foo(Some(42), 2);
+    foo(Some(42), 2, ""); //~ ERROR function takes
+    bar("", ""); //~ ERROR mismatched types
+    bar(1, 2);
+    bar(1, 2, 3); //~ ERROR function takes
+}
diff --git a/src/test/ui/span/issue-34264.stderr b/tests/ui/span/issue-34264.stderr
index 15179954a..15179954a 100644
--- a/src/test/ui/span/issue-34264.stderr
+++ b/tests/ui/span/issue-34264.stderr
diff --git a/src/test/ui/span/issue-35987.rs b/tests/ui/span/issue-35987.rs
index 3a6e6ffe2..3a6e6ffe2 100644
--- a/src/test/ui/span/issue-35987.rs
+++ b/tests/ui/span/issue-35987.rs
diff --git a/src/test/ui/span/issue-35987.stderr b/tests/ui/span/issue-35987.stderr
index 057d40ac0..057d40ac0 100644
--- a/src/test/ui/span/issue-35987.stderr
+++ b/tests/ui/span/issue-35987.stderr
diff --git a/src/test/ui/span/issue-36537.rs b/tests/ui/span/issue-36537.rs
index a5546ccbb..a5546ccbb 100644
--- a/src/test/ui/span/issue-36537.rs
+++ b/tests/ui/span/issue-36537.rs
diff --git a/src/test/ui/span/issue-36537.stderr b/tests/ui/span/issue-36537.stderr
index 79a0ebaeb..79a0ebaeb 100644
--- a/src/test/ui/span/issue-36537.stderr
+++ b/tests/ui/span/issue-36537.stderr
diff --git a/src/test/ui/span/issue-37767.rs b/tests/ui/span/issue-37767.rs
index 9e34c2c1f..9e34c2c1f 100644
--- a/src/test/ui/span/issue-37767.rs
+++ b/tests/ui/span/issue-37767.rs
diff --git a/src/test/ui/span/issue-37767.stderr b/tests/ui/span/issue-37767.stderr
index f7732847a..f7732847a 100644
--- a/src/test/ui/span/issue-37767.stderr
+++ b/tests/ui/span/issue-37767.stderr
diff --git a/src/test/ui/span/issue-39018.rs b/tests/ui/span/issue-39018.rs
index b6db4008d..b6db4008d 100644
--- a/src/test/ui/span/issue-39018.rs
+++ b/tests/ui/span/issue-39018.rs
diff --git a/src/test/ui/span/issue-39018.stderr b/tests/ui/span/issue-39018.stderr
index eea94643e..5d4d692b2 100644
--- a/src/test/ui/span/issue-39018.stderr
+++ b/tests/ui/span/issue-39018.stderr
@@ -26,11 +26,8 @@ note: an implementation of `Add<_>` might be missing for `World`
    |
 LL | enum World {
    | ^^^^^^^^^^ 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 add `String` to `&str`
   --> $DIR/issue-39018.rs:11:22
diff --git a/src/test/ui/span/issue-39698.rs b/tests/ui/span/issue-39698.rs
index 1079bae2c..1079bae2c 100644
--- a/src/test/ui/span/issue-39698.rs
+++ b/tests/ui/span/issue-39698.rs
diff --git a/src/test/ui/span/issue-39698.stderr b/tests/ui/span/issue-39698.stderr
index 25c35fd54..25c35fd54 100644
--- a/src/test/ui/span/issue-39698.stderr
+++ b/tests/ui/span/issue-39698.stderr
diff --git a/src/test/ui/span/issue-40157.rs b/tests/ui/span/issue-40157.rs
index 03ad21ae7..03ad21ae7 100644
--- a/src/test/ui/span/issue-40157.rs
+++ b/tests/ui/span/issue-40157.rs
diff --git a/src/test/ui/span/issue-40157.stderr b/tests/ui/span/issue-40157.stderr
index 57f80214a..57f80214a 100644
--- a/src/test/ui/span/issue-40157.stderr
+++ b/tests/ui/span/issue-40157.stderr
diff --git a/src/test/ui/span/issue-42234-unknown-receiver-type.full.stderr b/tests/ui/span/issue-42234-unknown-receiver-type.full.stderr
index 2b1789908..2b1789908 100644
--- a/src/test/ui/span/issue-42234-unknown-receiver-type.full.stderr
+++ b/tests/ui/span/issue-42234-unknown-receiver-type.full.stderr
diff --git a/src/test/ui/span/issue-42234-unknown-receiver-type.generic_arg.stderr b/tests/ui/span/issue-42234-unknown-receiver-type.generic_arg.stderr
index d93d54e87..d93d54e87 100644
--- a/src/test/ui/span/issue-42234-unknown-receiver-type.generic_arg.stderr
+++ b/tests/ui/span/issue-42234-unknown-receiver-type.generic_arg.stderr
diff --git a/src/test/ui/span/issue-42234-unknown-receiver-type.rs b/tests/ui/span/issue-42234-unknown-receiver-type.rs
index fd5312120..fd5312120 100644
--- a/src/test/ui/span/issue-42234-unknown-receiver-type.rs
+++ b/tests/ui/span/issue-42234-unknown-receiver-type.rs
diff --git a/src/test/ui/span/issue-43927-non-ADT-derive.rs b/tests/ui/span/issue-43927-non-ADT-derive.rs
index 935bfa001..935bfa001 100644
--- a/src/test/ui/span/issue-43927-non-ADT-derive.rs
+++ b/tests/ui/span/issue-43927-non-ADT-derive.rs
diff --git a/src/test/ui/span/issue-43927-non-ADT-derive.stderr b/tests/ui/span/issue-43927-non-ADT-derive.stderr
index e3ae37e36..e3ae37e36 100644
--- a/src/test/ui/span/issue-43927-non-ADT-derive.stderr
+++ b/tests/ui/span/issue-43927-non-ADT-derive.stderr
diff --git a/src/test/ui/span/issue-71363.rs b/tests/ui/span/issue-71363.rs
index f187d0efa..8014f3796 100644
--- a/src/test/ui/span/issue-71363.rs
+++ b/tests/ui/span/issue-71363.rs
@@ -1,4 +1,4 @@
-// compile-flags: -Z simulate-remapped-rust-src-base=/rustc/FAKE_PREFIX -Z translate-remapped-path-to-local-path=no -Z ui-testing=no
+// compile-flags: -Z ui-testing=no
 
 struct MyError;
 impl std::error::Error for MyError {}
diff --git a/tests/ui/span/issue-71363.stderr b/tests/ui/span/issue-71363.stderr
new file mode 100644
index 000000000..cb5cc3202
--- /dev/null
+++ b/tests/ui/span/issue-71363.stderr
@@ -0,0 +1,29 @@
+error[E0277]: `MyError` doesn't implement `std::fmt::Display`
+ --> $DIR/issue-71363.rs:4:28
+  |
+4 | impl std::error::Error for MyError {}
+  |                            ^^^^^^^ `MyError` cannot be formatted with the default formatter
+  |
+  = help: the trait `std::fmt::Display` is not implemented for `MyError`
+  = note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
+note: required by a bound in `std::error::Error`
+ --> $SRC_DIR/core/src/error.rs:LL:COL
+
+error[E0277]: `MyError` doesn't implement `Debug`
+ --> $DIR/issue-71363.rs:4:28
+  |
+4 | impl std::error::Error for MyError {}
+  |                            ^^^^^^^ `MyError` cannot be formatted using `{:?}`
+  |
+  = help: the trait `Debug` is not implemented for `MyError`
+  = note: add `#[derive(Debug)]` to `MyError` or manually `impl Debug for MyError`
+note: required by a bound in `std::error::Error`
+ --> $SRC_DIR/core/src/error.rs:LL:COL
+help: consider annotating `MyError` with `#[derive(Debug)]`
+  |
+3 | #[derive(Debug)]
+  |
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/span/issue-81800.rs b/tests/ui/span/issue-81800.rs
index 6ac66fdcb..6ac66fdcb 100644
--- a/src/test/ui/span/issue-81800.rs
+++ b/tests/ui/span/issue-81800.rs
diff --git a/src/test/ui/span/issue-81800.stderr b/tests/ui/span/issue-81800.stderr
index 86c64573b..86c64573b 100644
--- a/src/test/ui/span/issue-81800.stderr
+++ b/tests/ui/span/issue-81800.stderr
diff --git a/src/test/ui/span/issue28498-reject-ex1.rs b/tests/ui/span/issue28498-reject-ex1.rs
index 4d1b41255..4d1b41255 100644
--- a/src/test/ui/span/issue28498-reject-ex1.rs
+++ b/tests/ui/span/issue28498-reject-ex1.rs
diff --git a/src/test/ui/span/issue28498-reject-ex1.stderr b/tests/ui/span/issue28498-reject-ex1.stderr
index 86e2d8c56..86e2d8c56 100644
--- a/src/test/ui/span/issue28498-reject-ex1.stderr
+++ b/tests/ui/span/issue28498-reject-ex1.stderr
diff --git a/src/test/ui/span/issue28498-reject-lifetime-param.rs b/tests/ui/span/issue28498-reject-lifetime-param.rs
index 1e7190157..1e7190157 100644
--- a/src/test/ui/span/issue28498-reject-lifetime-param.rs
+++ b/tests/ui/span/issue28498-reject-lifetime-param.rs
diff --git a/src/test/ui/span/issue28498-reject-lifetime-param.stderr b/tests/ui/span/issue28498-reject-lifetime-param.stderr
index 3119ddd03..3119ddd03 100644
--- a/src/test/ui/span/issue28498-reject-lifetime-param.stderr
+++ b/tests/ui/span/issue28498-reject-lifetime-param.stderr
diff --git a/src/test/ui/span/issue28498-reject-passed-to-fn.rs b/tests/ui/span/issue28498-reject-passed-to-fn.rs
index dcd2e9ad4..dcd2e9ad4 100644
--- a/src/test/ui/span/issue28498-reject-passed-to-fn.rs
+++ b/tests/ui/span/issue28498-reject-passed-to-fn.rs
diff --git a/src/test/ui/span/issue28498-reject-passed-to-fn.stderr b/tests/ui/span/issue28498-reject-passed-to-fn.stderr
index 60e8a648c..60e8a648c 100644
--- a/src/test/ui/span/issue28498-reject-passed-to-fn.stderr
+++ b/tests/ui/span/issue28498-reject-passed-to-fn.stderr
diff --git a/src/test/ui/span/issue28498-reject-trait-bound.rs b/tests/ui/span/issue28498-reject-trait-bound.rs
index 444cebb19..444cebb19 100644
--- a/src/test/ui/span/issue28498-reject-trait-bound.rs
+++ b/tests/ui/span/issue28498-reject-trait-bound.rs
diff --git a/src/test/ui/span/issue28498-reject-trait-bound.stderr b/tests/ui/span/issue28498-reject-trait-bound.stderr
index 22e4a8205..22e4a8205 100644
--- a/src/test/ui/span/issue28498-reject-trait-bound.stderr
+++ b/tests/ui/span/issue28498-reject-trait-bound.stderr
diff --git a/src/test/ui/span/lint-unused-unsafe-thir.rs b/tests/ui/span/lint-unused-unsafe-thir.rs
index adb72c26b..adb72c26b 100644
--- a/src/test/ui/span/lint-unused-unsafe-thir.rs
+++ b/tests/ui/span/lint-unused-unsafe-thir.rs
diff --git a/src/test/ui/span/lint-unused-unsafe-thir.stderr b/tests/ui/span/lint-unused-unsafe-thir.stderr
index 3bcbb7597..3bcbb7597 100644
--- a/src/test/ui/span/lint-unused-unsafe-thir.stderr
+++ b/tests/ui/span/lint-unused-unsafe-thir.stderr
diff --git a/src/test/ui/span/lint-unused-unsafe.mir.stderr b/tests/ui/span/lint-unused-unsafe.mir.stderr
index d8412908c..d8412908c 100644
--- a/src/test/ui/span/lint-unused-unsafe.mir.stderr
+++ b/tests/ui/span/lint-unused-unsafe.mir.stderr
diff --git a/src/test/ui/span/lint-unused-unsafe.rs b/tests/ui/span/lint-unused-unsafe.rs
index 5d042768b..5d042768b 100644
--- a/src/test/ui/span/lint-unused-unsafe.rs
+++ b/tests/ui/span/lint-unused-unsafe.rs
diff --git a/src/test/ui/span/macro-span-replacement.rs b/tests/ui/span/macro-span-replacement.rs
index 66973c58d..66973c58d 100644
--- a/src/test/ui/span/macro-span-replacement.rs
+++ b/tests/ui/span/macro-span-replacement.rs
diff --git a/src/test/ui/span/macro-span-replacement.stderr b/tests/ui/span/macro-span-replacement.stderr
index 5dd563428..5dd563428 100644
--- a/src/test/ui/span/macro-span-replacement.stderr
+++ b/tests/ui/span/macro-span-replacement.stderr
diff --git a/src/test/ui/span/macro-ty-params.rs b/tests/ui/span/macro-ty-params.rs
index cf28b0255..cf28b0255 100644
--- a/src/test/ui/span/macro-ty-params.rs
+++ b/tests/ui/span/macro-ty-params.rs
diff --git a/src/test/ui/span/macro-ty-params.stderr b/tests/ui/span/macro-ty-params.stderr
index 7023ef8cd..7023ef8cd 100644
--- a/src/test/ui/span/macro-ty-params.stderr
+++ b/tests/ui/span/macro-ty-params.stderr
diff --git a/src/test/ui/span/method-and-field-eager-resolution.rs b/tests/ui/span/method-and-field-eager-resolution.rs
index a0f0d8810..a0f0d8810 100644
--- a/src/test/ui/span/method-and-field-eager-resolution.rs
+++ b/tests/ui/span/method-and-field-eager-resolution.rs
diff --git a/src/test/ui/span/method-and-field-eager-resolution.stderr b/tests/ui/span/method-and-field-eager-resolution.stderr
index 7d240589a..f6efbe40b 100644
--- a/src/test/ui/span/method-and-field-eager-resolution.stderr
+++ b/tests/ui/span/method-and-field-eager-resolution.stderr
@@ -9,8 +9,8 @@ LL |     x.0;
    |
 help: consider giving `x` an explicit type
    |
-LL |     let mut x: _ = Default::default();
-   |              +++
+LL |     let mut x: /* Type */ = Default::default();
+   |              ++++++++++++
 
 error[E0282]: type annotations needed
   --> $DIR/method-and-field-eager-resolution.rs:11:9
@@ -23,8 +23,8 @@ LL |     x[0];
    |
 help: consider giving `x` an explicit type
    |
-LL |     let mut x: _ = Default::default();
-   |              +++
+LL |     let mut x: /* Type */ = Default::default();
+   |              ++++++++++++
 
 error: aborting due to 2 previous errors
 
diff --git a/tests/ui/span/missing-unit-argument.rs b/tests/ui/span/missing-unit-argument.rs
new file mode 100644
index 000000000..db96ae223
--- /dev/null
+++ b/tests/ui/span/missing-unit-argument.rs
@@ -0,0 +1,17 @@
+fn foo(():(), ():()) {}
+fn bar(():()) {}
+
+struct S;
+impl S {
+    fn baz(self, (): ()) { }
+    fn generic<T>(self, _: T) { }
+}
+
+fn main() {
+    let _: Result<(), String> = Ok(); //~ ERROR this enum variant takes
+    foo(); //~ ERROR function takes
+    foo(()); //~ ERROR function takes
+    bar(); //~ ERROR function takes
+    S.baz(); //~ ERROR this method takes
+    S.generic::<()>(); //~ ERROR this method takes
+}
diff --git a/src/test/ui/span/missing-unit-argument.stderr b/tests/ui/span/missing-unit-argument.stderr
index b76a3ab30..ef4d732b5 100644
--- a/src/test/ui/span/missing-unit-argument.stderr
+++ b/tests/ui/span/missing-unit-argument.stderr
@@ -6,9 +6,6 @@ LL |     let _: Result<(), String> = Ok();
    |
 note: tuple variant defined here
   --> $SRC_DIR/core/src/result.rs:LL:COL
-   |
-LL |     Ok(#[stable(feature = "rust1", since = "1.0.0")] T),
-   |     ^^
 help: provide the argument
    |
 LL |     let _: Result<(), String> = Ok(());
@@ -62,7 +59,7 @@ help: provide the argument
 LL |     bar(());
    |        ~~~~
 
-error[E0061]: this function takes 1 argument but 0 arguments were supplied
+error[E0061]: this method takes 1 argument but 0 arguments were supplied
   --> $DIR/missing-unit-argument.rs:15:7
    |
 LL |     S.baz();
@@ -78,7 +75,7 @@ help: provide the argument
 LL |     S.baz(());
    |          ~~~~
 
-error[E0061]: this function takes 1 argument but 0 arguments were supplied
+error[E0061]: this method takes 1 argument but 0 arguments were supplied
   --> $DIR/missing-unit-argument.rs:16:7
    |
 LL |     S.generic::<()>();
diff --git a/src/test/ui/span/move-closure.rs b/tests/ui/span/move-closure.rs
index bdd7951b3..bdd7951b3 100644
--- a/src/test/ui/span/move-closure.rs
+++ b/tests/ui/span/move-closure.rs
diff --git a/src/test/ui/span/move-closure.stderr b/tests/ui/span/move-closure.stderr
index dcc607896..dcc607896 100644
--- a/src/test/ui/span/move-closure.stderr
+++ b/tests/ui/span/move-closure.stderr
diff --git a/src/test/ui/span/multiline-span-E0072.rs b/tests/ui/span/multiline-span-E0072.rs
index 728b47d65..728b47d65 100644
--- a/src/test/ui/span/multiline-span-E0072.rs
+++ b/tests/ui/span/multiline-span-E0072.rs
diff --git a/src/test/ui/span/multiline-span-E0072.stderr b/tests/ui/span/multiline-span-E0072.stderr
index fc2f6e662..fc2f6e662 100644
--- a/src/test/ui/span/multiline-span-E0072.stderr
+++ b/tests/ui/span/multiline-span-E0072.stderr
diff --git a/src/test/ui/span/multiline-span-simple.rs b/tests/ui/span/multiline-span-simple.rs
index 204a7f6b1..204a7f6b1 100644
--- a/src/test/ui/span/multiline-span-simple.rs
+++ b/tests/ui/span/multiline-span-simple.rs
diff --git a/src/test/ui/span/multiline-span-simple.stderr b/tests/ui/span/multiline-span-simple.stderr
index b44df962a..b44df962a 100644
--- a/src/test/ui/span/multiline-span-simple.stderr
+++ b/tests/ui/span/multiline-span-simple.stderr
diff --git a/src/test/ui/span/multispan-import-lint.rs b/tests/ui/span/multispan-import-lint.rs
index 3ce7f2ce3..3ce7f2ce3 100644
--- a/src/test/ui/span/multispan-import-lint.rs
+++ b/tests/ui/span/multispan-import-lint.rs
diff --git a/src/test/ui/span/multispan-import-lint.stderr b/tests/ui/span/multispan-import-lint.stderr
index 4a955d1b3..4a955d1b3 100644
--- a/src/test/ui/span/multispan-import-lint.stderr
+++ b/tests/ui/span/multispan-import-lint.stderr
diff --git a/src/test/ui/span/mut-arg-hint.rs b/tests/ui/span/mut-arg-hint.rs
index d7ff1f0de..d7ff1f0de 100644
--- a/src/test/ui/span/mut-arg-hint.rs
+++ b/tests/ui/span/mut-arg-hint.rs
diff --git a/tests/ui/span/mut-arg-hint.stderr b/tests/ui/span/mut-arg-hint.stderr
new file mode 100644
index 000000000..96ce4d5bc
--- /dev/null
+++ b/tests/ui/span/mut-arg-hint.stderr
@@ -0,0 +1,36 @@
+error[E0596]: cannot borrow `*a` as mutable, as it is behind a `&` reference
+  --> $DIR/mut-arg-hint.rs:3:9
+   |
+LL |         a.push_str("bar");
+   |         ^^^^^^^^^^^^^^^^^ `a` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     fn foo(mut a: &mut String) {
+   |                   ~~~~~~~~~~~
+
+error[E0596]: cannot borrow `*a` as mutable, as it is behind a `&` reference
+  --> $DIR/mut-arg-hint.rs:8:5
+   |
+LL |     a.push_str("foo");
+   |     ^^^^^^^^^^^^^^^^^ `a` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL | pub fn foo<'a>(mut a: &'a mut String) {
+   |                       ~~~~~~~~~~~~~~
+
+error[E0596]: cannot borrow `*a` as mutable, as it is behind a `&` reference
+  --> $DIR/mut-arg-hint.rs:15:9
+   |
+LL |         a.push_str("foo");
+   |         ^^^^^^^^^^^^^^^^^ `a` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     pub fn foo(mut a: &mut String) {
+   |                       ~~~~~~~~~~~
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/span/mut-ptr-cant-outlive-ref.rs b/tests/ui/span/mut-ptr-cant-outlive-ref.rs
index b8c752d73..b8c752d73 100644
--- a/src/test/ui/span/mut-ptr-cant-outlive-ref.rs
+++ b/tests/ui/span/mut-ptr-cant-outlive-ref.rs
diff --git a/src/test/ui/span/mut-ptr-cant-outlive-ref.stderr b/tests/ui/span/mut-ptr-cant-outlive-ref.stderr
index 4d976a7bb..4d976a7bb 100644
--- a/src/test/ui/span/mut-ptr-cant-outlive-ref.stderr
+++ b/tests/ui/span/mut-ptr-cant-outlive-ref.stderr
diff --git a/src/test/ui/span/non-existing-module-import.rs b/tests/ui/span/non-existing-module-import.rs
index d2ce7ec4f..d2ce7ec4f 100644
--- a/src/test/ui/span/non-existing-module-import.rs
+++ b/tests/ui/span/non-existing-module-import.rs
diff --git a/src/test/ui/span/non-existing-module-import.stderr b/tests/ui/span/non-existing-module-import.stderr
index 25c099590..25c099590 100644
--- a/src/test/ui/span/non-existing-module-import.stderr
+++ b/tests/ui/span/non-existing-module-import.stderr
diff --git a/src/test/ui/span/pub-struct-field.rs b/tests/ui/span/pub-struct-field.rs
index e149b9dbf..e149b9dbf 100644
--- a/src/test/ui/span/pub-struct-field.rs
+++ b/tests/ui/span/pub-struct-field.rs
diff --git a/src/test/ui/span/pub-struct-field.stderr b/tests/ui/span/pub-struct-field.stderr
index 065340f44..065340f44 100644
--- a/src/test/ui/span/pub-struct-field.stderr
+++ b/tests/ui/span/pub-struct-field.stderr
diff --git a/src/test/ui/span/range-2.rs b/tests/ui/span/range-2.rs
index c4bb16f44..c4bb16f44 100644
--- a/src/test/ui/span/range-2.rs
+++ b/tests/ui/span/range-2.rs
diff --git a/src/test/ui/span/range-2.stderr b/tests/ui/span/range-2.stderr
index 8ca8156b0..8ca8156b0 100644
--- a/src/test/ui/span/range-2.stderr
+++ b/tests/ui/span/range-2.stderr
diff --git a/src/test/ui/span/recursive-type-field.rs b/tests/ui/span/recursive-type-field.rs
index bd4c43534..bd4c43534 100644
--- a/src/test/ui/span/recursive-type-field.rs
+++ b/tests/ui/span/recursive-type-field.rs
diff --git a/src/test/ui/span/recursive-type-field.stderr b/tests/ui/span/recursive-type-field.stderr
index 10af4c36b..10af4c36b 100644
--- a/src/test/ui/span/recursive-type-field.stderr
+++ b/tests/ui/span/recursive-type-field.stderr
diff --git a/src/test/ui/span/regionck-unboxed-closure-lifetimes.rs b/tests/ui/span/regionck-unboxed-closure-lifetimes.rs
index 60ccaa872..60ccaa872 100644
--- a/src/test/ui/span/regionck-unboxed-closure-lifetimes.rs
+++ b/tests/ui/span/regionck-unboxed-closure-lifetimes.rs
diff --git a/src/test/ui/span/regionck-unboxed-closure-lifetimes.stderr b/tests/ui/span/regionck-unboxed-closure-lifetimes.stderr
index 0b985de60..0b985de60 100644
--- a/src/test/ui/span/regionck-unboxed-closure-lifetimes.stderr
+++ b/tests/ui/span/regionck-unboxed-closure-lifetimes.stderr
diff --git a/src/test/ui/span/regions-close-over-borrowed-ref-in-obj.rs b/tests/ui/span/regions-close-over-borrowed-ref-in-obj.rs
index 16b4cc258..16b4cc258 100644
--- a/src/test/ui/span/regions-close-over-borrowed-ref-in-obj.rs
+++ b/tests/ui/span/regions-close-over-borrowed-ref-in-obj.rs
diff --git a/src/test/ui/span/regions-close-over-borrowed-ref-in-obj.stderr b/tests/ui/span/regions-close-over-borrowed-ref-in-obj.stderr
index 81e858fa0..81e858fa0 100644
--- a/src/test/ui/span/regions-close-over-borrowed-ref-in-obj.stderr
+++ b/tests/ui/span/regions-close-over-borrowed-ref-in-obj.stderr
diff --git a/src/test/ui/span/regions-close-over-type-parameter-2.rs b/tests/ui/span/regions-close-over-type-parameter-2.rs
index aca3972cb..aca3972cb 100644
--- a/src/test/ui/span/regions-close-over-type-parameter-2.rs
+++ b/tests/ui/span/regions-close-over-type-parameter-2.rs
diff --git a/src/test/ui/span/regions-close-over-type-parameter-2.stderr b/tests/ui/span/regions-close-over-type-parameter-2.stderr
index 2e584d9a8..2e584d9a8 100644
--- a/src/test/ui/span/regions-close-over-type-parameter-2.stderr
+++ b/tests/ui/span/regions-close-over-type-parameter-2.stderr
diff --git a/src/test/ui/span/regions-escape-loop-via-variable.rs b/tests/ui/span/regions-escape-loop-via-variable.rs
index ad468896b..ad468896b 100644
--- a/src/test/ui/span/regions-escape-loop-via-variable.rs
+++ b/tests/ui/span/regions-escape-loop-via-variable.rs
diff --git a/src/test/ui/span/regions-escape-loop-via-variable.stderr b/tests/ui/span/regions-escape-loop-via-variable.stderr
index 42df66852..42df66852 100644
--- a/src/test/ui/span/regions-escape-loop-via-variable.stderr
+++ b/tests/ui/span/regions-escape-loop-via-variable.stderr
diff --git a/src/test/ui/span/regions-escape-loop-via-vec.rs b/tests/ui/span/regions-escape-loop-via-vec.rs
index 1fceb0969..1fceb0969 100644
--- a/src/test/ui/span/regions-escape-loop-via-vec.rs
+++ b/tests/ui/span/regions-escape-loop-via-vec.rs
diff --git a/src/test/ui/span/regions-escape-loop-via-vec.stderr b/tests/ui/span/regions-escape-loop-via-vec.stderr
index 2b6493077..2b6493077 100644
--- a/src/test/ui/span/regions-escape-loop-via-vec.stderr
+++ b/tests/ui/span/regions-escape-loop-via-vec.stderr
diff --git a/src/test/ui/span/regions-infer-borrow-scope-within-loop.rs b/tests/ui/span/regions-infer-borrow-scope-within-loop.rs
index 3b20285b1..3b20285b1 100644
--- a/src/test/ui/span/regions-infer-borrow-scope-within-loop.rs
+++ b/tests/ui/span/regions-infer-borrow-scope-within-loop.rs
diff --git a/src/test/ui/span/regions-infer-borrow-scope-within-loop.stderr b/tests/ui/span/regions-infer-borrow-scope-within-loop.stderr
index fd67c65c4..fd67c65c4 100644
--- a/src/test/ui/span/regions-infer-borrow-scope-within-loop.stderr
+++ b/tests/ui/span/regions-infer-borrow-scope-within-loop.stderr
diff --git a/src/test/ui/span/send-is-not-static-ensures-scoping.rs b/tests/ui/span/send-is-not-static-ensures-scoping.rs
index 2aecc2a7e..2aecc2a7e 100644
--- a/src/test/ui/span/send-is-not-static-ensures-scoping.rs
+++ b/tests/ui/span/send-is-not-static-ensures-scoping.rs
diff --git a/src/test/ui/span/send-is-not-static-ensures-scoping.stderr b/tests/ui/span/send-is-not-static-ensures-scoping.stderr
index 65d10c130..65d10c130 100644
--- a/src/test/ui/span/send-is-not-static-ensures-scoping.stderr
+++ b/tests/ui/span/send-is-not-static-ensures-scoping.stderr
diff --git a/src/test/ui/span/send-is-not-static-std-sync-2.rs b/tests/ui/span/send-is-not-static-std-sync-2.rs
index 38746d4cb..38746d4cb 100644
--- a/src/test/ui/span/send-is-not-static-std-sync-2.rs
+++ b/tests/ui/span/send-is-not-static-std-sync-2.rs
diff --git a/src/test/ui/span/send-is-not-static-std-sync-2.stderr b/tests/ui/span/send-is-not-static-std-sync-2.stderr
index bcd07e116..bcd07e116 100644
--- a/src/test/ui/span/send-is-not-static-std-sync-2.stderr
+++ b/tests/ui/span/send-is-not-static-std-sync-2.stderr
diff --git a/src/test/ui/span/send-is-not-static-std-sync.rs b/tests/ui/span/send-is-not-static-std-sync.rs
index f8ab5243c..f8ab5243c 100644
--- a/src/test/ui/span/send-is-not-static-std-sync.rs
+++ b/tests/ui/span/send-is-not-static-std-sync.rs
diff --git a/src/test/ui/span/send-is-not-static-std-sync.stderr b/tests/ui/span/send-is-not-static-std-sync.stderr
index 5d493a3e4..5d493a3e4 100644
--- a/src/test/ui/span/send-is-not-static-std-sync.stderr
+++ b/tests/ui/span/send-is-not-static-std-sync.stderr
diff --git a/src/test/ui/span/slice-borrow.rs b/tests/ui/span/slice-borrow.rs
index 38cd7acbd..38cd7acbd 100644
--- a/src/test/ui/span/slice-borrow.rs
+++ b/tests/ui/span/slice-borrow.rs
diff --git a/src/test/ui/span/slice-borrow.stderr b/tests/ui/span/slice-borrow.stderr
index b70bf69d6..b70bf69d6 100644
--- a/src/test/ui/span/slice-borrow.stderr
+++ b/tests/ui/span/slice-borrow.stderr
diff --git a/src/test/ui/span/suggestion-non-ascii.rs b/tests/ui/span/suggestion-non-ascii.rs
index 914efd85a..914efd85a 100644
--- a/src/test/ui/span/suggestion-non-ascii.rs
+++ b/tests/ui/span/suggestion-non-ascii.rs
diff --git a/src/test/ui/span/suggestion-non-ascii.stderr b/tests/ui/span/suggestion-non-ascii.stderr
index b14632d4e..b14632d4e 100644
--- a/src/test/ui/span/suggestion-non-ascii.stderr
+++ b/tests/ui/span/suggestion-non-ascii.stderr
diff --git a/src/test/ui/span/transitive-dep-span.rs b/tests/ui/span/transitive-dep-span.rs
index 2d46f74ad..2d46f74ad 100644
--- a/src/test/ui/span/transitive-dep-span.rs
+++ b/tests/ui/span/transitive-dep-span.rs
diff --git a/src/test/ui/span/transitive-dep-span.stderr b/tests/ui/span/transitive-dep-span.stderr
index 4dc3e5721..4dc3e5721 100644
--- a/src/test/ui/span/transitive-dep-span.stderr
+++ b/tests/ui/span/transitive-dep-span.stderr
diff --git a/src/test/ui/span/type-annotations-needed-expr.rs b/tests/ui/span/type-annotations-needed-expr.rs
index f64dab4d7..f64dab4d7 100644
--- a/src/test/ui/span/type-annotations-needed-expr.rs
+++ b/tests/ui/span/type-annotations-needed-expr.rs
diff --git a/src/test/ui/span/type-annotations-needed-expr.stderr b/tests/ui/span/type-annotations-needed-expr.stderr
index 9dff6c64d..9dff6c64d 100644
--- a/src/test/ui/span/type-annotations-needed-expr.stderr
+++ b/tests/ui/span/type-annotations-needed-expr.stderr
diff --git a/src/test/ui/span/type-binding.rs b/tests/ui/span/type-binding.rs
index 32016e127..32016e127 100644
--- a/src/test/ui/span/type-binding.rs
+++ b/tests/ui/span/type-binding.rs
diff --git a/src/test/ui/span/type-binding.stderr b/tests/ui/span/type-binding.stderr
index cb0aefe06..cb0aefe06 100644
--- a/src/test/ui/span/type-binding.stderr
+++ b/tests/ui/span/type-binding.stderr
diff --git a/src/test/ui/span/typo-suggestion.rs b/tests/ui/span/typo-suggestion.rs
index e9d7bc65e..e9d7bc65e 100644
--- a/src/test/ui/span/typo-suggestion.rs
+++ b/tests/ui/span/typo-suggestion.rs
diff --git a/src/test/ui/span/typo-suggestion.stderr b/tests/ui/span/typo-suggestion.stderr
index 61d4e0611..61d4e0611 100644
--- a/src/test/ui/span/typo-suggestion.stderr
+++ b/tests/ui/span/typo-suggestion.stderr
diff --git a/src/test/ui/span/unused-warning-point-at-identifier.rs b/tests/ui/span/unused-warning-point-at-identifier.rs
index af4834503..af4834503 100644
--- a/src/test/ui/span/unused-warning-point-at-identifier.rs
+++ b/tests/ui/span/unused-warning-point-at-identifier.rs
diff --git a/src/test/ui/span/unused-warning-point-at-identifier.stderr b/tests/ui/span/unused-warning-point-at-identifier.stderr
index c2cb56231..c2cb56231 100644
--- a/src/test/ui/span/unused-warning-point-at-identifier.stderr
+++ b/tests/ui/span/unused-warning-point-at-identifier.stderr
diff --git a/src/test/ui/span/vec-must-not-hide-type-from-dropck.rs b/tests/ui/span/vec-must-not-hide-type-from-dropck.rs
index 9bfbfab06..9bfbfab06 100644
--- a/src/test/ui/span/vec-must-not-hide-type-from-dropck.rs
+++ b/tests/ui/span/vec-must-not-hide-type-from-dropck.rs
diff --git a/src/test/ui/span/vec-must-not-hide-type-from-dropck.stderr b/tests/ui/span/vec-must-not-hide-type-from-dropck.stderr
index f87c32d1a..f87c32d1a 100644
--- a/src/test/ui/span/vec-must-not-hide-type-from-dropck.stderr
+++ b/tests/ui/span/vec-must-not-hide-type-from-dropck.stderr
diff --git a/src/test/ui/span/vec_refs_data_with_early_death.rs b/tests/ui/span/vec_refs_data_with_early_death.rs
index c23c52115..c23c52115 100644
--- a/src/test/ui/span/vec_refs_data_with_early_death.rs
+++ b/tests/ui/span/vec_refs_data_with_early_death.rs
diff --git a/src/test/ui/span/vec_refs_data_with_early_death.stderr b/tests/ui/span/vec_refs_data_with_early_death.stderr
index 684e78453..684e78453 100644
--- a/src/test/ui/span/vec_refs_data_with_early_death.stderr
+++ b/tests/ui/span/vec_refs_data_with_early_death.stderr
diff --git a/src/test/ui/span/visibility-ty-params.rs b/tests/ui/span/visibility-ty-params.rs
index d77febe0a..d77febe0a 100644
--- a/src/test/ui/span/visibility-ty-params.rs
+++ b/tests/ui/span/visibility-ty-params.rs
diff --git a/src/test/ui/span/visibility-ty-params.stderr b/tests/ui/span/visibility-ty-params.stderr
index 067893fd2..067893fd2 100644
--- a/src/test/ui/span/visibility-ty-params.stderr
+++ b/tests/ui/span/visibility-ty-params.stderr
diff --git a/src/test/ui/span/wf-method-late-bound-regions.rs b/tests/ui/span/wf-method-late-bound-regions.rs
index ca9f73d0a..ca9f73d0a 100644
--- a/src/test/ui/span/wf-method-late-bound-regions.rs
+++ b/tests/ui/span/wf-method-late-bound-regions.rs
diff --git a/src/test/ui/span/wf-method-late-bound-regions.stderr b/tests/ui/span/wf-method-late-bound-regions.stderr
index 6b0b00820..6b0b00820 100644
--- a/src/test/ui/span/wf-method-late-bound-regions.stderr
+++ b/tests/ui/span/wf-method-late-bound-regions.stderr