Auto merge of #91093 - matthiaskrgr:rollup-kovzwx0, r=matthiaskrgr

Rollup of 6 pull requests Successful merges: - #89741 (Mark `Arc::from_inner` / `Rc::from_inner` as unsafe) - #90927 (Fix float ICE) - #90994 (Fix ICE `#90993`: add missing call to cancel) - #91018 (Adopt let_else in more places in rustc_mir_build) - #91022 (Suggest `await` in more situations where infer types are involved) - #91088 (Revert "require full validity when determining the discriminant of a value") Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
author: bors <bors@rust-lang.org> 2021-11-20 21:40:43 +0000
committer: bors <bors@rust-lang.org> 2021-11-20 21:40:43 +0000
commit: 5bc98076f37dd8c1476de4bbe0515c55a65332b7 (patch)
tree: 72069a573411275125b5cf4ebe6230ffefe7c5ac
parent: 2885c474823637ae69c5967327327a337aebedb2 (diff)
parent: 83c83d4dd7eb92e2f65a336f36a46cbc087570ea (diff)
download: rust-5bc98076f37dd8c1476de4bbe0515c55a65332b7.tar.gz
rust-5bc98076f37dd8c1476de4bbe0515c55a65332b7.zip
352 files changed, 263 insertions, 119 deletions
diff --git a/compiler/rustc_const_eval/src/interpret/intrinsics.rs b/compiler/rustc_const_eval/src/interpret/intrinsics.rs
index 9bbb42eb019..44da27a43db 100644
--- a/compiler/rustc_const_eval/src/interpret/intrinsics.rs
+++ b/compiler/rustc_const_eval/src/interpret/intrinsics.rs
@@ -265,12 +265,6 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
             }
             sym::discriminant_value => {
                 let place = self.deref_operand(&args[0])?;
-                if M::enforce_validity(self) {
-                    // This is 'using' the value, so make sure the validity invariant is satisfied.
-                    // (Also see https://github.com/rust-lang/rust/pull/89764.)
-                    self.validate_operand(&place.into())?;
-                }
-
                 let discr_val = self.read_discriminant(&place.into())?.0;
                 self.write_scalar(discr_val, dest)?;
             }
diff --git a/compiler/rustc_const_eval/src/interpret/step.rs b/compiler/rustc_const_eval/src/interpret/step.rs
index 2759a7d9d26..e6037d561de 100644
--- a/compiler/rustc_const_eval/src/interpret/step.rs
+++ b/compiler/rustc_const_eval/src/interpret/step.rs
@@ -304,12 +304,6 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
 
             Discriminant(place) => {
                 let op = self.eval_place_to_op(place, None)?;
-                if M::enforce_validity(self) {
-                    // This is 'using' the value, so make sure the validity invariant is satisfied.
-                    // (Also see https://github.com/rust-lang/rust/pull/89764.)
-                    self.validate_operand(&op)?;
-                }
-
                 let discr_val = self.read_discriminant(&op)?.0;
                 self.write_scalar(discr_val, &dest)?;
             }
diff --git a/compiler/rustc_infer/src/infer/error_reporting/mod.rs b/compiler/rustc_infer/src/infer/error_reporting/mod.rs
index c25ec1356e2..3c2f9900080 100644
--- a/compiler/rustc_infer/src/infer/error_reporting/mod.rs
+++ b/compiler/rustc_infer/src/infer/error_reporting/mod.rs
@@ -310,6 +310,34 @@ pub fn unexpected_hidden_region_diagnostic(
     err
 }
 
+/// Structurally compares two types, modulo any inference variables.
+///
+/// Returns `true` if two types are equal, or if one type is an inference variable compatible
+/// with the other type. A TyVar inference type is compatible with any type, and an IntVar or
+/// FloatVar inference type are compatible with themselves or their concrete types (Int and
+/// Float types, respectively). When comparing two ADTs, these rules apply recursively.
+pub fn same_type_modulo_infer(a: Ty<'tcx>, b: Ty<'ctx>) -> bool {
+    match (&a.kind(), &b.kind()) {
+        (&ty::Adt(did_a, substs_a), &ty::Adt(did_b, substs_b)) => {
+            if did_a != did_b {
+                return false;
+            }
+
+            substs_a.types().zip(substs_b.types()).all(|(a, b)| same_type_modulo_infer(a, b))
+        }
+        (&ty::Int(_), &ty::Infer(ty::InferTy::IntVar(_)))
+        | (&ty::Infer(ty::InferTy::IntVar(_)), &ty::Int(_) | &ty::Infer(ty::InferTy::IntVar(_)))
+        | (&ty::Float(_), &ty::Infer(ty::InferTy::FloatVar(_)))
+        | (
+            &ty::Infer(ty::InferTy::FloatVar(_)),
+            &ty::Float(_) | &ty::Infer(ty::InferTy::FloatVar(_)),
+        )
+        | (&ty::Infer(ty::InferTy::TyVar(_)), _)
+        | (_, &ty::Infer(ty::InferTy::TyVar(_))) => true,
+        _ => a == b,
+    }
+}
+
 impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
     pub fn report_region_errors(&self, errors: &Vec<RegionResolutionError<'tcx>>) {
         debug!("report_region_errors(): {} errors to start", errors.len());
@@ -1761,7 +1789,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
             self.get_impl_future_output_ty(exp_found.expected),
             self.get_impl_future_output_ty(exp_found.found),
         ) {
-            (Some(exp), Some(found)) if ty::TyS::same_type(exp, found) => match &cause.code {
+            (Some(exp), Some(found)) if same_type_modulo_infer(exp, found) => match &cause.code {
                 ObligationCauseCode::IfExpression(box IfExpressionCause { then, .. }) => {
                     diag.multipart_suggestion(
                         "consider `await`ing on both `Future`s",
@@ -1793,7 +1821,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
                     diag.help("consider `await`ing on both `Future`s");
                 }
             },
-            (_, Some(ty)) if ty::TyS::same_type(exp_found.expected, ty) => {
+            (_, Some(ty)) if same_type_modulo_infer(exp_found.expected, ty) => {
                 diag.span_suggestion_verbose(
                     exp_span.shrink_to_hi(),
                     "consider `await`ing on the `Future`",
@@ -1801,7 +1829,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
                     Applicability::MaybeIncorrect,
                 );
             }
-            (Some(ty), _) if ty::TyS::same_type(ty, exp_found.found) => match cause.code {
+            (Some(ty), _) if same_type_modulo_infer(ty, exp_found.found) => match cause.code {
                 ObligationCauseCode::Pattern { span: Some(span), .. }
                 | ObligationCauseCode::IfExpression(box IfExpressionCause { then: span, .. }) => {
                     diag.span_suggestion_verbose(
diff --git a/compiler/rustc_mir_build/src/build/matches/mod.rs b/compiler/rustc_mir_build/src/build/matches/mod.rs
index 6320d5d4749..e3a05e01ea8 100644
--- a/compiler/rustc_mir_build/src/build/matches/mod.rs
+++ b/compiler/rustc_mir_build/src/build/matches/mod.rs
@@ -1606,13 +1606,12 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         // encounter a candidate where the test is not relevant; at
         // that point, we stop sorting.
         while let Some(candidate) = candidates.first_mut() {
-            if let Some(idx) = self.sort_candidate(&match_place.clone(), &test, candidate) {
-                let (candidate, rest) = candidates.split_first_mut().unwrap();
-                target_candidates[idx].push(candidate);
-                candidates = rest;
-            } else {
+            let Some(idx) = self.sort_candidate(&match_place.clone(), &test, candidate) else {
                 break;
-            }
+            };
+            let (candidate, rest) = candidates.split_first_mut().unwrap();
+            target_candidates[idx].push(candidate);
+            candidates = rest;
         }
         // at least the first candidate ought to be tested
         assert!(total_candidate_count > candidates.len());
diff --git a/compiler/rustc_mir_build/src/build/mod.rs b/compiler/rustc_mir_build/src/build/mod.rs
index 4108ad50470..cb94e759972 100644
--- a/compiler/rustc_mir_build/src/build/mod.rs
+++ b/compiler/rustc_mir_build/src/build/mod.rs
@@ -966,59 +966,58 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                 DropKind::Value,
             );
 
-            if let Some(arg) = arg_opt {
-                let pat = match tcx.hir().get(arg.pat.hir_id) {
-                    Node::Pat(pat) | Node::Binding(pat) => pat,
-                    node => bug!("pattern became {:?}", node),
-                };
-                let pattern = pat_from_hir(tcx, self.param_env, self.typeck_results, pat);
-                let original_source_scope = self.source_scope;
-                let span = pattern.span;
-                self.set_correct_source_scope_for_arg(arg.hir_id, original_source_scope, span);
-                match *pattern.kind {
-                    // Don't introduce extra copies for simple bindings
-                    PatKind::Binding {
-                        mutability,
-                        var,
-                        mode: BindingMode::ByValue,
-                        subpattern: None,
-                        ..
-                    } => {
-                        self.local_decls[local].mutability = mutability;
-                        self.local_decls[local].source_info.scope = self.source_scope;
-                        self.local_decls[local].local_info = if let Some(kind) = self_binding {
-                            Some(Box::new(LocalInfo::User(ClearCrossCrate::Set(
-                                BindingForm::ImplicitSelf(*kind),
-                            ))))
-                        } else {
-                            let binding_mode = ty::BindingMode::BindByValue(mutability);
-                            Some(Box::new(LocalInfo::User(ClearCrossCrate::Set(BindingForm::Var(
-                                VarBindingForm {
-                                    binding_mode,
-                                    opt_ty_info,
-                                    opt_match_place: Some((Some(place), span)),
-                                    pat_span: span,
-                                },
-                            )))))
-                        };
-                        self.var_indices.insert(var, LocalsForNode::One(local));
-                    }
-                    _ => {
-                        scope = self.declare_bindings(
-                            scope,
-                            expr.span,
-                            &pattern,
-                            matches::ArmHasGuard(false),
-                            Some((Some(&place), span)),
-                        );
-                        let place_builder = PlaceBuilder::from(local);
-                        unpack!(
-                            block = self.place_into_pattern(block, pattern, place_builder, false)
-                        );
-                    }
+            let Some(arg) = arg_opt else {
+                continue;
+            };
+            let pat = match tcx.hir().get(arg.pat.hir_id) {
+                Node::Pat(pat) | Node::Binding(pat) => pat,
+                node => bug!("pattern became {:?}", node),
+            };
+            let pattern = pat_from_hir(tcx, self.param_env, self.typeck_results, pat);
+            let original_source_scope = self.source_scope;
+            let span = pattern.span;
+            self.set_correct_source_scope_for_arg(arg.hir_id, original_source_scope, span);
+            match *pattern.kind {
+                // Don't introduce extra copies for simple bindings
+                PatKind::Binding {
+                    mutability,
+                    var,
+                    mode: BindingMode::ByValue,
+                    subpattern: None,
+                    ..
+                } => {
+                    self.local_decls[local].mutability = mutability;
+                    self.local_decls[local].source_info.scope = self.source_scope;
+                    self.local_decls[local].local_info = if let Some(kind) = self_binding {
+                        Some(Box::new(LocalInfo::User(ClearCrossCrate::Set(
+                            BindingForm::ImplicitSelf(*kind),
+                        ))))
+                    } else {
+                        let binding_mode = ty::BindingMode::BindByValue(mutability);
+                        Some(Box::new(LocalInfo::User(ClearCrossCrate::Set(BindingForm::Var(
+                            VarBindingForm {
+                                binding_mode,
+                                opt_ty_info,
+                                opt_match_place: Some((Some(place), span)),
+                                pat_span: span,
+                            },
+                        )))))
+                    };
+                    self.var_indices.insert(var, LocalsForNode::One(local));
+                }
+                _ => {
+                    scope = self.declare_bindings(
+                        scope,
+                        expr.span,
+                        &pattern,
+                        matches::ArmHasGuard(false),
+                        Some((Some(&place), span)),
+                    );
+                    let place_builder = PlaceBuilder::from(local);
+                    unpack!(block = self.place_into_pattern(block, pattern, place_builder, false));
                 }
-                self.source_scope = original_source_scope;
             }
+            self.source_scope = original_source_scope;
         }
 
         // Enter the argument pattern bindings source scope, if it exists.
diff --git a/compiler/rustc_mir_build/src/check_unsafety.rs b/compiler/rustc_mir_build/src/check_unsafety.rs
index 0e82b187201..7940bd1f33d 100644
--- a/compiler/rustc_mir_build/src/check_unsafety.rs
+++ b/compiler/rustc_mir_build/src/check_unsafety.rs
@@ -256,23 +256,22 @@ impl<'a, 'tcx> Visitor<'a, 'tcx> for UnsafetyVisitor<'a, 'tcx> {
             }
             PatKind::Binding { mode: BindingMode::ByRef(borrow_kind), ty, .. } => {
                 if self.inside_adt {
-                    if let ty::Ref(_, ty, _) = ty.kind() {
-                        match borrow_kind {
-                            BorrowKind::Shallow | BorrowKind::Shared | BorrowKind::Unique => {
-                                if !ty.is_freeze(self.tcx.at(pat.span), self.param_env) {
-                                    self.requires_unsafe(pat.span, BorrowOfLayoutConstrainedField);
-                                }
-                            }
-                            BorrowKind::Mut { .. } => {
-                                self.requires_unsafe(pat.span, MutationOfLayoutConstrainedField);
-                            }
-                        }
-                    } else {
+                    let ty::Ref(_, ty, _) = ty.kind() else {
                         span_bug!(
                             pat.span,
                             "BindingMode::ByRef in pattern, but found non-reference type {}",
                             ty
                         );
+                    };
+                    match borrow_kind {
+                        BorrowKind::Shallow | BorrowKind::Shared | BorrowKind::Unique => {
+                            if !ty.is_freeze(self.tcx.at(pat.span), self.param_env) {
+                                self.requires_unsafe(pat.span, BorrowOfLayoutConstrainedField);
+                            }
+                        }
+                        BorrowKind::Mut { .. } => {
+                            self.requires_unsafe(pat.span, MutationOfLayoutConstrainedField);
+                        }
                     }
                 }
                 visit::walk_pat(self, pat);
diff --git a/compiler/rustc_parse/src/parser/expr.rs b/compiler/rustc_parse/src/parser/expr.rs
index 3d29d305021..0c8c45410bd 100644
--- a/compiler/rustc_parse/src/parser/expr.rs
+++ b/compiler/rustc_parse/src/parser/expr.rs
@@ -1032,6 +1032,8 @@ impl<'a> Parser<'a> {
             [IdentLike(_), Punct('+' | '-')] |
             // 1e+2 | 1e-2
             [IdentLike(_), Punct('+' | '-'), IdentLike(_)] |
+            // 1.2e+ | 1.2e-
+            [IdentLike(_), Punct('.'), IdentLike(_), Punct('+' | '-')] |
             // 1.2e+3 | 1.2e-3
             [IdentLike(_), Punct('.'), IdentLike(_), Punct('+' | '-'), IdentLike(_)] => {
                 // See the FIXME about `TokenCursor` above.
diff --git a/compiler/rustc_parse/src/parser/pat.rs b/compiler/rustc_parse/src/parser/pat.rs
index b03b5459981..3b5a297103c 100644
--- a/compiler/rustc_parse/src/parser/pat.rs
+++ b/compiler/rustc_parse/src/parser/pat.rs
@@ -817,7 +817,7 @@ impl<'a> Parser<'a> {
             // Ensure the user doesn't receive unhelpful unexpected token errors
             self.bump();
             if self.is_pat_range_end_start(0) {
-                let _ = self.parse_pat_range_end();
+                let _ = self.parse_pat_range_end().map_err(|mut e| e.cancel());
             }
 
             self.error_inclusive_range_with_extra_equals(span_with_eq);
diff --git a/library/alloc/src/rc.rs b/library/alloc/src/rc.rs
index 03e33a1ff2b..c4e5e44fec0 100644
--- a/library/alloc/src/rc.rs
+++ b/library/alloc/src/rc.rs
@@ -341,12 +341,12 @@ impl<T: ?Sized> Rc<T> {
         unsafe { self.ptr.as_ref() }
     }
 
-    fn from_inner(ptr: NonNull<RcBox<T>>) -> Self {
+    unsafe fn from_inner(ptr: NonNull<RcBox<T>>) -> Self {
         Self { ptr, phantom: PhantomData }
     }
 
     unsafe fn from_ptr(ptr: *mut RcBox<T>) -> Self {
-        Self::from_inner(unsafe { NonNull::new_unchecked(ptr) })
+        unsafe { Self::from_inner(NonNull::new_unchecked(ptr)) }
     }
 }
 
@@ -367,9 +367,11 @@ impl<T> Rc<T> {
         // pointers, which ensures that the weak destructor never frees
         // the allocation while the strong destructor is running, even
         // if the weak pointer is stored inside the strong one.
-        Self::from_inner(
-            Box::leak(box RcBox { strong: Cell::new(1), weak: Cell::new(1), value }).into(),
-        )
+        unsafe {
+            Self::from_inner(
+                Box::leak(box RcBox { strong: Cell::new(1), weak: Cell::new(1), value }).into(),
+            )
+        }
     }
 
     /// Constructs a new `Rc<T>` using a weak reference to itself. Attempting
@@ -420,16 +422,16 @@ impl<T> Rc<T> {
         // otherwise.
         let data = data_fn(&weak);
 
-        unsafe {
+        let strong = unsafe {
             let inner = init_ptr.as_ptr();
             ptr::write(ptr::addr_of_mut!((*inner).value), data);
 
             let prev_value = (*inner).strong.get();
             debug_assert_eq!(prev_value, 0, "No prior strong references should exist");
             (*inner).strong.set(1);
-        }
 
-        let strong = Rc::from_inner(init_ptr);
+            Rc::from_inner(init_ptr)
+        };
 
         // Strong references should collectively own a shared weak reference,
         // so don't run the destructor for our old weak reference.
@@ -521,10 +523,12 @@ impl<T> Rc<T> {
         // pointers, which ensures that the weak destructor never frees
         // the allocation while the strong destructor is running, even
         // if the weak pointer is stored inside the strong one.
-        Ok(Self::from_inner(
-            Box::leak(Box::try_new(RcBox { strong: Cell::new(1), weak: Cell::new(1), value })?)
-                .into(),
-        ))
+        unsafe {
+            Ok(Self::from_inner(
+                Box::leak(Box::try_new(RcBox { strong: Cell::new(1), weak: Cell::new(1), value })?)
+                    .into(),
+            ))
+        }
     }
 
     /// Constructs a new `Rc` with uninitialized contents, returning an error if the allocation fails
@@ -746,7 +750,7 @@ impl<T> Rc<mem::MaybeUninit<T>> {
     #[unstable(feature = "new_uninit", issue = "63291")]
     #[inline]
     pub unsafe fn assume_init(self) -> Rc<T> {
-        Rc::from_inner(mem::ManuallyDrop::new(self).ptr.cast())
+        unsafe { Rc::from_inner(mem::ManuallyDrop::new(self).ptr.cast()) }
     }
 }
 
@@ -1214,9 +1218,11 @@ impl Rc<dyn Any> {
     /// ```
     pub fn downcast<T: Any>(self) -> Result<Rc<T>, Rc<dyn Any>> {
         if (*self).is::<T>() {
-            let ptr = self.ptr.cast::<RcBox<T>>();
-            forget(self);
-            Ok(Rc::from_inner(ptr))
+            unsafe {
+                let ptr = self.ptr.cast::<RcBox<T>>();
+                forget(self);
+                Ok(Rc::from_inner(ptr))
+            }
         } else {
             Err(self)
         }
@@ -1489,8 +1495,10 @@ impl<T: ?Sized> Clone for Rc<T> {
     /// ```
     #[inline]
     fn clone(&self) -> Rc<T> {
-        self.inner().inc_strong();
-        Self::from_inner(self.ptr)
+        unsafe {
+            self.inner().inc_strong();
+            Self::from_inner(self.ptr)
+        }
     }
 }
 
@@ -2245,11 +2253,14 @@ impl<T: ?Sized> Weak<T> {
     #[stable(feature = "rc_weak", since = "1.4.0")]
     pub fn upgrade(&self) -> Option<Rc<T>> {
         let inner = self.inner()?;
+
         if inner.strong() == 0 {
             None
         } else {
-            inner.inc_strong();
-            Some(Rc::from_inner(self.ptr))
+            unsafe {
+                inner.inc_strong();
+                Some(Rc::from_inner(self.ptr))
+            }
         }
     }
 
diff --git a/library/alloc/src/sync.rs b/library/alloc/src/sync.rs
index b738337a2dd..733a898b285 100644
--- a/library/alloc/src/sync.rs
+++ b/library/alloc/src/sync.rs
@@ -252,7 +252,7 @@ impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<Arc<U>> for Arc<T> {}
 impl<T: ?Sized + Unsize<U>, U: ?Sized> DispatchFromDyn<Arc<U>> for Arc<T> {}
 
 impl<T: ?Sized> Arc<T> {
-    fn from_inner(ptr: NonNull<ArcInner<T>>) -> Self {
+    unsafe fn from_inner(ptr: NonNull<ArcInner<T>>) -> Self {
         Self { ptr, phantom: PhantomData }
     }
 
@@ -348,7 +348,7 @@ impl<T> Arc<T> {
             weak: atomic::AtomicUsize::new(1),
             data,
         };
-        Self::from_inner(Box::leak(x).into())
+        unsafe { Self::from_inner(Box::leak(x).into()) }
     }
 
     /// Constructs a new `Arc<T>` using a weak reference to itself. Attempting
@@ -397,7 +397,7 @@ impl<T> Arc<T> {
 
         // Now we can properly initialize the inner value and turn our weak
         // reference into a strong reference.
-        unsafe {
+        let strong = unsafe {
             let inner = init_ptr.as_ptr();
             ptr::write(ptr::addr_of_mut!((*inner).data), data);
 
@@ -415,9 +415,9 @@ impl<T> Arc<T> {
             // possible with safe code alone.
             let prev_value = (*inner).strong.fetch_add(1, Release);
             debug_assert_eq!(prev_value, 0, "No prior strong references should exist");
-        }
 
-        let strong = Arc::from_inner(init_ptr);
+            Arc::from_inner(init_ptr)
+        };
 
         // Strong references should collectively own a shared weak reference,
         // so don't run the destructor for our old weak reference.
@@ -529,7 +529,7 @@ impl<T> Arc<T> {
             weak: atomic::AtomicUsize::new(1),
             data,
         })?;
-        Ok(Self::from_inner(Box::leak(x).into()))
+        unsafe { Ok(Self::from_inner(Box::leak(x).into())) }
     }
 
     /// Constructs a new `Arc` with uninitialized contents, returning an error
@@ -743,7 +743,7 @@ impl<T> Arc<mem::MaybeUninit<T>> {
     #[must_use = "`self` will be dropped if the result is not used"]
     #[inline]
     pub unsafe fn assume_init(self) -> Arc<T> {
-        Arc::from_inner(mem::ManuallyDrop::new(self).ptr.cast())
+        unsafe { Arc::from_inner(mem::ManuallyDrop::new(self).ptr.cast()) }
     }
 }
 
@@ -1341,7 +1341,7 @@ impl<T: ?Sized> Clone for Arc<T> {
             abort();
         }
 
-        Self::from_inner(self.ptr)
+        unsafe { Self::from_inner(self.ptr) }
     }
 }
 
@@ -1668,9 +1668,11 @@ impl Arc<dyn Any + Send + Sync> {
         T: Any + Send + Sync + 'static,
     {
         if (*self).is::<T>() {
-            let ptr = self.ptr.cast::<ArcInner<T>>();
-            mem::forget(self);
-            Ok(Arc::from_inner(ptr))
+            unsafe {
+                let ptr = self.ptr.cast::<ArcInner<T>>();
+                mem::forget(self);
+                Ok(Arc::from_inner(ptr))
+            }
         } else {
             Err(self)
         }
@@ -1899,7 +1901,7 @@ impl<T: ?Sized> Weak<T> {
             // value can be initialized after `Weak` references have already been created. In that case, we
             // expect to observe the fully initialized value.
             match inner.strong.compare_exchange_weak(n, n + 1, Acquire, Relaxed) {
-                Ok(_) => return Some(Arc::from_inner(self.ptr)), // null checked above
+                Ok(_) => return Some(unsafe { Arc::from_inner(self.ptr) }), // null checked above
                 Err(old) => n = old,
             }
         }
diff --git a/src/test/ui/async-await/suggest-missing-await.rs b/src/test/ui/async-await/suggest-missing-await.rs
index df74df79d9f..c7c5b51e733 100644
--- a/src/test/ui/async-await/suggest-missing-await.rs
+++ b/src/test/ui/async-await/suggest-missing-await.rs
@@ -54,4 +54,21 @@ async fn suggest_await_on_match_expr() {
     };
 }
 
+async fn dummy_result() -> Result<(), ()> {
+    Ok(())
+}
+
+#[allow(unused)]
+async fn suggest_await_in_generic_pattern() {
+    match dummy_result() {
+        //~^ HELP consider `await`ing on the `Future`
+        //~| HELP consider `await`ing on the `Future`
+        //~| SUGGESTION .await
+        Ok(_) => {}
+        //~^ ERROR mismatched types [E0308]
+        Err(_) => {}
+        //~^ ERROR mismatched types [E0308]
+    }
+}
+
 fn main() {}
diff --git a/src/test/ui/async-await/suggest-missing-await.stderr b/src/test/ui/async-await/suggest-missing-await.stderr
index bea50b3bfc0..3cca9616a35 100644
--- a/src/test/ui/async-await/suggest-missing-await.stderr
+++ b/src/test/ui/async-await/suggest-missing-await.stderr
@@ -106,6 +106,42 @@ help: consider `await`ing on the `Future`
 LL |     let _x = match dummy().await {
    |                           ++++++
 
-error: aborting due to 5 previous errors
+error[E0308]: mismatched types
+  --> $DIR/suggest-missing-await.rs:67:9
+   |
+LL |         Ok(_) => {}
+   |         ^^^^^ expected opaque type, found enum `Result`
+   |
+note: while checking the return type of the `async fn`
+  --> $DIR/suggest-missing-await.rs:57:28
+   |
+LL | async fn dummy_result() -> Result<(), ()> {
+   |                            ^^^^^^^^^^^^^^ checked the `Output` of this `async fn`, expected opaque type
+   = note: expected opaque type `impl Future<Output = Result<(), ()>>`
+                     found enum `Result<_, _>`
+help: consider `await`ing on the `Future`
+   |
+LL |     match dummy_result().await {
+   |                         ++++++
+
+error[E0308]: mismatched types
+  --> $DIR/suggest-missing-await.rs:69:9
+   |
+LL |         Err(_) => {}
+   |         ^^^^^^ expected opaque type, found enum `Result`
+   |
+note: while checking the return type of the `async fn`
+  --> $DIR/suggest-missing-await.rs:57:28
+   |
+LL | async fn dummy_result() -> Result<(), ()> {
+   |                            ^^^^^^^^^^^^^^ checked the `Output` of this `async fn`, expected opaque type
+   = note: expected opaque type `impl Future<Output = Result<(), ()>>`
+                     found enum `Result<_, _>`
+help: consider `await`ing on the `Future`
+   |
+LL |     match dummy_result().await {
+   |                         ++++++
+
+error: aborting due to 7 previous errors
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/parser/issue-90728.rs b/src/test/ui/parser/issue-90728.rs
new file mode 100644
index 00000000000..d6a898361cc
--- /dev/null
+++ b/src/test/ui/parser/issue-90728.rs
@@ -0,0 +1,6 @@
+fn main() {
+    a.5.2E+
+    //~^ ERROR: unexpected token: `5.2E+`
+    //~| ERROR: expected one of `.`, `;`, `?`, `}`, or an operator, found `5.2E+`
+    //~| ERROR: expected at least one digit in exponent
+}
diff --git a/src/test/ui/parser/issue-90728.stderr b/src/test/ui/parser/issue-90728.stderr
new file mode 100644
index 00000000000..b55c4603066
--- /dev/null
+++ b/src/test/ui/parser/issue-90728.stderr
@@ -0,0 +1,20 @@
+error: expected at least one digit in exponent
+  --> $DIR/issue-90728.rs:2:7
+   |
+LL |     a.5.2E+
+   |       ^^^^^
+
+error: unexpected token: `5.2E+`
+  --> $DIR/issue-90728.rs:2:7
+   |
+LL |     a.5.2E+
+   |       ^^^^^
+
+error: expected one of `.`, `;`, `?`, `}`, or an operator, found `5.2E+`
+  --> $DIR/issue-90728.rs:2:7
+   |
+LL |     a.5.2E+
+   |       ^^^^^ expected one of `.`, `;`, `?`, `}`, or an operator
+
+error: aborting due to 3 previous errors
+
diff --git a/src/test/ui/parser/auxiliary/issue-21146-inc.rs b/src/test/ui/parser/issues/auxiliary/issue-21146-inc.rs
index 32a3b9dcc35..32a3b9dcc35 100644
--- a/src/test/ui/parser/auxiliary/issue-21146-inc.rs
+++ b/src/test/ui/parser/issues/auxiliary/issue-21146-inc.rs
diff --git a/src/test/ui/parser/auxiliary/issue-89971-outer-attr-following-inner-attr-ice.rs b/src/test/ui/parser/issues/auxiliary/issue-89971-outer-attr-following-inner-attr-ice.rs
index e5604b816b5..e5604b816b5 100644
--- a/src/test/ui/parser/auxiliary/issue-89971-outer-attr-following-inner-attr-ice.rs
+++ b/src/test/ui/parser/issues/auxiliary/issue-89971-outer-attr-following-inner-attr-ice.rs
diff --git a/src/test/ui/parser/issue-10392-2.fixed b/src/test/ui/parser/issues/issue-10392-2.fixed
index 3386fac17df..3386fac17df 100644
--- a/src/test/ui/parser/issue-10392-2.fixed
+++ b/src/test/ui/parser/issues/issue-10392-2.fixed
diff --git a/src/test/ui/parser/issue-10392-2.rs b/src/test/ui/parser/issues/issue-10392-2.rs
index 30628ae31c3..30628ae31c3 100644
--- a/src/test/ui/parser/issue-10392-2.rs
+++ b/src/test/ui/parser/issues/issue-10392-2.rs
diff --git a/src/test/ui/parser/issue-10392-2.stderr b/src/test/ui/parser/issues/issue-10392-2.stderr
index 4154ecfeb71..4154ecfeb71 100644
--- a/src/test/ui/parser/issue-10392-2.stderr
+++ b/src/test/ui/parser/issues/issue-10392-2.stderr
diff --git a/src/test/ui/parser/issue-10392.rs b/src/test/ui/parser/issues/issue-10392.rs
index 5b0c2fc2be4..5b0c2fc2be4 100644
--- a/src/test/ui/parser/issue-10392.rs
+++ b/src/test/ui/parser/issues/issue-10392.rs
diff --git a/src/test/ui/parser/issue-10392.stderr b/src/test/ui/parser/issues/issue-10392.stderr
index 438ea67d33c..438ea67d33c 100644
--- a/src/test/ui/parser/issue-10392.stderr
+++ b/src/test/ui/parser/issues/issue-10392.stderr
diff --git a/src/test/ui/parser/issue-10636-1.rs b/src/test/ui/parser/issues/issue-10636-1.rs
index 77c6072d6fc..77c6072d6fc 100644
--- a/src/test/ui/parser/issue-10636-1.rs
+++ b/src/test/ui/parser/issues/issue-10636-1.rs
diff --git a/src/test/ui/parser/issue-10636-1.stderr b/src/test/ui/parser/issues/issue-10636-1.stderr
index 1e6294ebe16..1e6294ebe16 100644
--- a/src/test/ui/parser/issue-10636-1.stderr
+++ b/src/test/ui/parser/issues/issue-10636-1.stderr
diff --git a/src/test/ui/parser/issue-10636-2.rs b/src/test/ui/parser/issues/issue-10636-2.rs
index 6fb63639d5f..6fb63639d5f 100644
--- a/src/test/ui/parser/issue-10636-2.rs
+++ b/src/test/ui/parser/issues/issue-10636-2.rs
diff --git a/src/test/ui/parser/issue-10636-2.stderr b/src/test/ui/parser/issues/issue-10636-2.stderr
index d4f2da9e3ab..d4f2da9e3ab 100644
--- a/src/test/ui/parser/issue-10636-2.stderr
+++ b/src/test/ui/parser/issues/issue-10636-2.stderr
diff --git a/src/test/ui/parser/issue-13483.rs b/src/test/ui/parser/issues/issue-13483.rs
index a2fd9264b15..a2fd9264b15 100644
--- a/src/test/ui/parser/issue-13483.rs
+++ b/src/test/ui/parser/issues/issue-13483.rs
diff --git a/src/test/ui/parser/issue-13483.stderr b/src/test/ui/parser/issues/issue-13483.stderr
index 5fd05b18ce0..5fd05b18ce0 100644
--- a/src/test/ui/parser/issue-13483.stderr
+++ b/src/test/ui/parser/issues/issue-13483.stderr
diff --git a/src/test/ui/parser/issue-14303-enum.rs b/src/test/ui/parser/issues/issue-14303-enum.rs
index a6106159805..a6106159805 100644
--- a/src/test/ui/parser/issue-14303-enum.rs
+++ b/src/test/ui/parser/issues/issue-14303-enum.rs
diff --git a/src/test/ui/parser/issue-14303-enum.stderr b/src/test/ui/parser/issues/issue-14303-enum.stderr
index bcecd75b1ab..bcecd75b1ab 100644
--- a/src/test/ui/parser/issue-14303-enum.stderr
+++ b/src/test/ui/parser/issues/issue-14303-enum.stderr
diff --git a/src/test/ui/parser/issue-14303-fn-def.rs b/src/test/ui/parser/issues/issue-14303-fn-def.rs
index 221bd311e74..221bd311e74 100644
--- a/src/test/ui/parser/issue-14303-fn-def.rs
+++ b/src/test/ui/parser/issues/issue-14303-fn-def.rs
diff --git a/src/test/ui/parser/issue-14303-fn-def.stderr b/src/test/ui/parser/issues/issue-14303-fn-def.stderr
index 082c37e0be7..082c37e0be7 100644
--- a/src/test/ui/parser/issue-14303-fn-def.stderr
+++ b/src/test/ui/parser/issues/issue-14303-fn-def.stderr
diff --git a/src/test/ui/parser/issue-14303-fncall.full.stderr b/src/test/ui/parser/issues/issue-14303-fncall.full.stderr
index 02af61e8539..02af61e8539 100644
--- a/src/test/ui/parser/issue-14303-fncall.full.stderr
+++ b/src/test/ui/parser/issues/issue-14303-fncall.full.stderr
diff --git a/src/test/ui/parser/issue-14303-fncall.generic_arg.stderr b/src/test/ui/parser/issues/issue-14303-fncall.generic_arg.stderr
index 9f3359b3f68..9f3359b3f68 100644
--- a/src/test/ui/parser/issue-14303-fncall.generic_arg.stderr
+++ b/src/test/ui/parser/issues/issue-14303-fncall.generic_arg.stderr
diff --git a/src/test/ui/parser/issue-14303-fncall.rs b/src/test/ui/parser/issues/issue-14303-fncall.rs
index 976a79a59b1..976a79a59b1 100644
--- a/src/test/ui/parser/issue-14303-fncall.rs
+++ b/src/test/ui/parser/issues/issue-14303-fncall.rs
diff --git a/src/test/ui/parser/issue-14303-impl.rs b/src/test/ui/parser/issues/issue-14303-impl.rs
index 4dc2c666018..4dc2c666018 100644
--- a/src/test/ui/parser/issue-14303-impl.rs
+++ b/src/test/ui/parser/issues/issue-14303-impl.rs
diff --git a/src/test/ui/parser/issue-14303-impl.stderr b/src/test/ui/parser/issues/issue-14303-impl.stderr
index 3b5615d2a9e..3b5615d2a9e 100644
--- a/src/test/ui/parser/issue-14303-impl.stderr
+++ b/src/test/ui/parser/issues/issue-14303-impl.stderr
diff --git a/src/test/ui/parser/issue-14303-path.rs b/src/test/ui/parser/issues/issue-14303-path.rs
index 89ef914aba2..89ef914aba2 100644
--- a/src/test/ui/parser/issue-14303-path.rs
+++ b/src/test/ui/parser/issues/issue-14303-path.rs
diff --git a/src/test/ui/parser/issue-14303-path.stderr b/src/test/ui/parser/issues/issue-14303-path.stderr
index 841e63ecbe9..841e63ecbe9 100644
--- a/src/test/ui/parser/issue-14303-path.stderr
+++ b/src/test/ui/parser/issues/issue-14303-path.stderr
diff --git a/src/test/ui/parser/issue-14303-struct.rs b/src/test/ui/parser/issues/issue-14303-struct.rs
index 0bd10b4d085..0bd10b4d085 100644
--- a/src/test/ui/parser/issue-14303-struct.rs
+++ b/src/test/ui/parser/issues/issue-14303-struct.rs
diff --git a/src/test/ui/parser/issue-14303-struct.stderr b/src/test/ui/parser/issues/issue-14303-struct.stderr
index dbd0b987dd1..dbd0b987dd1 100644
--- a/src/test/ui/parser/issue-14303-struct.stderr
+++ b/src/test/ui/parser/issues/issue-14303-struct.stderr
diff --git a/src/test/ui/parser/issue-14303-trait.rs b/src/test/ui/parser/issues/issue-14303-trait.rs
index f253de92d92..f253de92d92 100644
--- a/src/test/ui/parser/issue-14303-trait.rs
+++ b/src/test/ui/parser/issues/issue-14303-trait.rs
diff --git a/src/test/ui/parser/issue-14303-trait.stderr b/src/test/ui/parser/issues/issue-14303-trait.stderr
index 7dfa62d823f..7dfa62d823f 100644
--- a/src/test/ui/parser/issue-14303-trait.stderr
+++ b/src/test/ui/parser/issues/issue-14303-trait.stderr
diff --git a/src/test/ui/parser/issue-15914.rs b/src/test/ui/parser/issues/issue-15914.rs
index 4a5606af6d0..4a5606af6d0 100644
--- a/src/test/ui/parser/issue-15914.rs
+++ b/src/test/ui/parser/issues/issue-15914.rs
diff --git a/src/test/ui/parser/issue-15914.stderr b/src/test/ui/parser/issues/issue-15914.stderr
index ea26453f808..ea26453f808 100644
--- a/src/test/ui/parser/issue-15914.stderr
+++ b/src/test/ui/parser/issues/issue-15914.stderr
diff --git a/src/test/ui/parser/issue-15980.rs b/src/test/ui/parser/issues/issue-15980.rs
index 87faa7d5ff1..87faa7d5ff1 100644
--- a/src/test/ui/parser/issue-15980.rs
+++ b/src/test/ui/parser/issues/issue-15980.rs
diff --git a/src/test/ui/parser/issue-15980.stderr b/src/test/ui/parser/issues/issue-15980.stderr
index 5cefead2c74..5cefead2c74 100644
--- a/src/test/ui/parser/issue-15980.stderr
+++ b/src/test/ui/parser/issues/issue-15980.stderr
diff --git a/src/test/ui/parser/issue-1655.rs b/src/test/ui/parser/issues/issue-1655.rs
index e9fc6f15346..e9fc6f15346 100644
--- a/src/test/ui/parser/issue-1655.rs
+++ b/src/test/ui/parser/issues/issue-1655.rs
diff --git a/src/test/ui/parser/issue-1655.stderr b/src/test/ui/parser/issues/issue-1655.stderr
index 0c390a0ec56..0c390a0ec56 100644
--- a/src/test/ui/parser/issue-1655.stderr
+++ b/src/test/ui/parser/issues/issue-1655.stderr
diff --git a/src/test/ui/parser/issue-17383.rs b/src/test/ui/parser/issues/issue-17383.rs
index 7bf0e64f2c0..7bf0e64f2c0 100644
--- a/src/test/ui/parser/issue-17383.rs
+++ b/src/test/ui/parser/issues/issue-17383.rs
diff --git a/src/test/ui/parser/issue-17383.stderr b/src/test/ui/parser/issues/issue-17383.stderr
index 265d6e14866..265d6e14866 100644
--- a/src/test/ui/parser/issue-17383.stderr
+++ b/src/test/ui/parser/issues/issue-17383.stderr
diff --git a/src/test/ui/parser/issue-17718-const-mut.rs b/src/test/ui/parser/issues/issue-17718-const-mut.rs
index 795a8c7631d..795a8c7631d 100644
--- a/src/test/ui/parser/issue-17718-const-mut.rs
+++ b/src/test/ui/parser/issues/issue-17718-const-mut.rs
diff --git a/src/test/ui/parser/issue-17718-const-mut.stderr b/src/test/ui/parser/issues/issue-17718-const-mut.stderr
index 8251ce9993f..8251ce9993f 100644
--- a/src/test/ui/parser/issue-17718-const-mut.stderr
+++ b/src/test/ui/parser/issues/issue-17718-const-mut.stderr
diff --git a/src/test/ui/parser/issue-17904-2.rs b/src/test/ui/parser/issues/issue-17904-2.rs
index 186a955c313..186a955c313 100644
--- a/src/test/ui/parser/issue-17904-2.rs
+++ b/src/test/ui/parser/issues/issue-17904-2.rs
diff --git a/src/test/ui/parser/issue-17904-2.stderr b/src/test/ui/parser/issues/issue-17904-2.stderr
index 9c7fdf6ccb4..9c7fdf6ccb4 100644
--- a/src/test/ui/parser/issue-17904-2.stderr
+++ b/src/test/ui/parser/issues/issue-17904-2.stderr
diff --git a/src/test/ui/parser/issue-17904.rs b/src/test/ui/parser/issues/issue-17904.rs
index 7d6a54f4be1..7d6a54f4be1 100644
--- a/src/test/ui/parser/issue-17904.rs
+++ b/src/test/ui/parser/issues/issue-17904.rs
diff --git a/src/test/ui/parser/issue-17904.stderr b/src/test/ui/parser/issues/issue-17904.stderr
index a3cac676189..a3cac676189 100644
--- a/src/test/ui/parser/issue-17904.stderr
+++ b/src/test/ui/parser/issues/issue-17904.stderr
diff --git a/src/test/ui/parser/issue-1802-1.rs b/src/test/ui/parser/issues/issue-1802-1.rs
index 3c34b0d8feb..3c34b0d8feb 100644
--- a/src/test/ui/parser/issue-1802-1.rs
+++ b/src/test/ui/parser/issues/issue-1802-1.rs
diff --git a/src/test/ui/parser/issue-1802-1.stderr b/src/test/ui/parser/issues/issue-1802-1.stderr
index 954cc0beeef..954cc0beeef 100644
--- a/src/test/ui/parser/issue-1802-1.stderr
+++ b/src/test/ui/parser/issues/issue-1802-1.stderr
diff --git a/src/test/ui/parser/issue-1802-2.rs b/src/test/ui/parser/issues/issue-1802-2.rs
index 3c34b0d8feb..3c34b0d8feb 100644
--- a/src/test/ui/parser/issue-1802-2.rs
+++ b/src/test/ui/parser/issues/issue-1802-2.rs
diff --git a/src/test/ui/parser/issue-1802-2.stderr b/src/test/ui/parser/issues/issue-1802-2.stderr
index 49043d07b35..49043d07b35 100644
--- a/src/test/ui/parser/issue-1802-2.stderr
+++ b/src/test/ui/parser/issues/issue-1802-2.stderr
diff --git a/src/test/ui/parser/issue-19096.rs b/src/test/ui/parser/issues/issue-19096.rs
index c5bfd10ee5e..c5bfd10ee5e 100644
--- a/src/test/ui/parser/issue-19096.rs
+++ b/src/test/ui/parser/issues/issue-19096.rs
diff --git a/src/test/ui/parser/issue-19096.stderr b/src/test/ui/parser/issues/issue-19096.stderr
index 4df7f878b9e..4df7f878b9e 100644
--- a/src/test/ui/parser/issue-19096.stderr
+++ b/src/test/ui/parser/issues/issue-19096.stderr
diff --git a/src/test/ui/parser/issue-19398.rs b/src/test/ui/parser/issues/issue-19398.rs
index 46eb320a172..46eb320a172 100644
--- a/src/test/ui/parser/issue-19398.rs
+++ b/src/test/ui/parser/issues/issue-19398.rs
diff --git a/src/test/ui/parser/issue-19398.stderr b/src/test/ui/parser/issues/issue-19398.stderr
index 1da00960adf..1da00960adf 100644
--- a/src/test/ui/parser/issue-19398.stderr
+++ b/src/test/ui/parser/issues/issue-19398.stderr
diff --git a/src/test/ui/parser/issue-20616-1.rs b/src/test/ui/parser/issues/issue-20616-1.rs
index 49e9cb310c1..49e9cb310c1 100644
--- a/src/test/ui/parser/issue-20616-1.rs
+++ b/src/test/ui/parser/issues/issue-20616-1.rs
diff --git a/src/test/ui/parser/issue-20616-1.stderr b/src/test/ui/parser/issues/issue-20616-1.stderr
index 81604623785..81604623785 100644
--- a/src/test/ui/parser/issue-20616-1.stderr
+++ b/src/test/ui/parser/issues/issue-20616-1.stderr
diff --git a/src/test/ui/parser/issue-20616-2.rs b/src/test/ui/parser/issues/issue-20616-2.rs
index f108ae5de14..f108ae5de14 100644
--- a/src/test/ui/parser/issue-20616-2.rs
+++ b/src/test/ui/parser/issues/issue-20616-2.rs
diff --git a/src/test/ui/parser/issue-20616-2.stderr b/src/test/ui/parser/issues/issue-20616-2.stderr
index 01e3d3dd7cc..01e3d3dd7cc 100644
--- a/src/test/ui/parser/issue-20616-2.stderr
+++ b/src/test/ui/parser/issues/issue-20616-2.stderr
diff --git a/src/test/ui/parser/issue-20616-3.rs b/src/test/ui/parser/issues/issue-20616-3.rs
index b2371051c78..b2371051c78 100644
--- a/src/test/ui/parser/issue-20616-3.rs
+++ b/src/test/ui/parser/issues/issue-20616-3.rs
diff --git a/src/test/ui/parser/issue-20616-3.stderr b/src/test/ui/parser/issues/issue-20616-3.stderr
index b535c7a3267..b535c7a3267 100644
--- a/src/test/ui/parser/issue-20616-3.stderr
+++ b/src/test/ui/parser/issues/issue-20616-3.stderr
diff --git a/src/test/ui/parser/issue-20616-4.rs b/src/test/ui/parser/issues/issue-20616-4.rs
index a71f47ca4bf..a71f47ca4bf 100644
--- a/src/test/ui/parser/issue-20616-4.rs
+++ b/src/test/ui/parser/issues/issue-20616-4.rs
diff --git a/src/test/ui/parser/issue-20616-4.stderr b/src/test/ui/parser/issues/issue-20616-4.stderr
index 2b3b75f3119..2b3b75f3119 100644
--- a/src/test/ui/parser/issue-20616-4.stderr
+++ b/src/test/ui/parser/issues/issue-20616-4.stderr
diff --git a/src/test/ui/parser/issue-20616-5.rs b/src/test/ui/parser/issues/issue-20616-5.rs
index b96d09d59ae..b96d09d59ae 100644
--- a/src/test/ui/parser/issue-20616-5.rs
+++ b/src/test/ui/parser/issues/issue-20616-5.rs
diff --git a/src/test/ui/parser/issue-20616-5.stderr b/src/test/ui/parser/issues/issue-20616-5.stderr
index 1ec1dbde695..1ec1dbde695 100644
--- a/src/test/ui/parser/issue-20616-5.stderr
+++ b/src/test/ui/parser/issues/issue-20616-5.stderr
diff --git a/src/test/ui/parser/issue-20616-6.rs b/src/test/ui/parser/issues/issue-20616-6.rs
index a2c45ecec7a..a2c45ecec7a 100644
--- a/src/test/ui/parser/issue-20616-6.rs
+++ b/src/test/ui/parser/issues/issue-20616-6.rs
diff --git a/src/test/ui/parser/issue-20616-6.stderr b/src/test/ui/parser/issues/issue-20616-6.stderr
index 7401abdd091..7401abdd091 100644
--- a/src/test/ui/parser/issue-20616-6.stderr
+++ b/src/test/ui/parser/issues/issue-20616-6.stderr
diff --git a/src/test/ui/parser/issue-20616-7.rs b/src/test/ui/parser/issues/issue-20616-7.rs
index 67209c02adf..67209c02adf 100644
--- a/src/test/ui/parser/issue-20616-7.rs
+++ b/src/test/ui/parser/issues/issue-20616-7.rs
diff --git a/src/test/ui/parser/issue-20616-7.stderr b/src/test/ui/parser/issues/issue-20616-7.stderr
index e2c3efe8447..e2c3efe8447 100644
--- a/src/test/ui/parser/issue-20616-7.stderr
+++ b/src/test/ui/parser/issues/issue-20616-7.stderr
diff --git a/src/test/ui/parser/issue-20616-8.rs b/src/test/ui/parser/issues/issue-20616-8.rs
index 3ceb58d1252..3ceb58d1252 100644
--- a/src/test/ui/parser/issue-20616-8.rs
+++ b/src/test/ui/parser/issues/issue-20616-8.rs
diff --git a/src/test/ui/parser/issue-20616-8.stderr b/src/test/ui/parser/issues/issue-20616-8.stderr
index e9f37e50fff..e9f37e50fff 100644
--- a/src/test/ui/parser/issue-20616-8.stderr
+++ b/src/test/ui/parser/issues/issue-20616-8.stderr
diff --git a/src/test/ui/parser/issue-20616-9.rs b/src/test/ui/parser/issues/issue-20616-9.rs
index 7f84284481e..7f84284481e 100644
--- a/src/test/ui/parser/issue-20616-9.rs
+++ b/src/test/ui/parser/issues/issue-20616-9.rs
diff --git a/src/test/ui/parser/issue-20616-9.stderr b/src/test/ui/parser/issues/issue-20616-9.stderr
index dc309d1bce1..dc309d1bce1 100644
--- a/src/test/ui/parser/issue-20616-9.stderr
+++ b/src/test/ui/parser/issues/issue-20616-9.stderr
diff --git a/src/test/ui/parser/issue-20711-2.rs b/src/test/ui/parser/issues/issue-20711-2.rs
index 168c7e76162..168c7e76162 100644
--- a/src/test/ui/parser/issue-20711-2.rs
+++ b/src/test/ui/parser/issues/issue-20711-2.rs
diff --git a/src/test/ui/parser/issue-20711-2.stderr b/src/test/ui/parser/issues/issue-20711-2.stderr
index 12b18bbc594..12b18bbc594 100644
--- a/src/test/ui/parser/issue-20711-2.stderr
+++ b/src/test/ui/parser/issues/issue-20711-2.stderr
diff --git a/src/test/ui/parser/issue-20711.rs b/src/test/ui/parser/issues/issue-20711.rs
index 020bb79d6e7..020bb79d6e7 100644
--- a/src/test/ui/parser/issue-20711.rs
+++ b/src/test/ui/parser/issues/issue-20711.rs
diff --git a/src/test/ui/parser/issue-20711.stderr b/src/test/ui/parser/issues/issue-20711.stderr
index 4af4b22bee2..4af4b22bee2 100644
--- a/src/test/ui/parser/issue-20711.stderr
+++ b/src/test/ui/parser/issues/issue-20711.stderr
diff --git a/src/test/ui/parser/issue-21146.rs b/src/test/ui/parser/issues/issue-21146.rs
index 19eaffc3edd..19eaffc3edd 100644
--- a/src/test/ui/parser/issue-21146.rs
+++ b/src/test/ui/parser/issues/issue-21146.rs
diff --git a/src/test/ui/parser/issue-21146.stderr b/src/test/ui/parser/issues/issue-21146.stderr
index c71fda3d63f..c71fda3d63f 100644
--- a/src/test/ui/parser/issue-21146.stderr
+++ b/src/test/ui/parser/issues/issue-21146.stderr
diff --git a/src/test/ui/parser/issue-21153.rs b/src/test/ui/parser/issues/issue-21153.rs
index bf5fdb1f3c6..bf5fdb1f3c6 100644
--- a/src/test/ui/parser/issue-21153.rs
+++ b/src/test/ui/parser/issues/issue-21153.rs
diff --git a/src/test/ui/parser/issue-21153.stderr b/src/test/ui/parser/issues/issue-21153.stderr
index cbfa9ded3c3..cbfa9ded3c3 100644
--- a/src/test/ui/parser/issue-21153.stderr
+++ b/src/test/ui/parser/issues/issue-21153.stderr
diff --git a/src/test/ui/parser/issue-21475.rs b/src/test/ui/parser/issues/issue-21475.rs
index b028fcae077..b028fcae077 100644
--- a/src/test/ui/parser/issue-21475.rs
+++ b/src/test/ui/parser/issues/issue-21475.rs
diff --git a/src/test/ui/parser/issue-22647.rs b/src/test/ui/parser/issues/issue-22647.rs
index a6861410682..a6861410682 100644
--- a/src/test/ui/parser/issue-22647.rs
+++ b/src/test/ui/parser/issues/issue-22647.rs
diff --git a/src/test/ui/parser/issue-22647.stderr b/src/test/ui/parser/issues/issue-22647.stderr
index 89b454d1973..89b454d1973 100644
--- a/src/test/ui/parser/issue-22647.stderr
+++ b/src/test/ui/parser/issues/issue-22647.stderr
diff --git a/src/test/ui/parser/issue-22712.rs b/src/test/ui/parser/issues/issue-22712.rs
index 774de9c7e64..774de9c7e64 100644
--- a/src/test/ui/parser/issue-22712.rs
+++ b/src/test/ui/parser/issues/issue-22712.rs
diff --git a/src/test/ui/parser/issue-22712.stderr b/src/test/ui/parser/issues/issue-22712.stderr
index 30fabac6564..30fabac6564 100644
--- a/src/test/ui/parser/issue-22712.stderr
+++ b/src/test/ui/parser/issues/issue-22712.stderr
diff --git a/src/test/ui/parser/issue-2354-1.rs b/src/test/ui/parser/issues/issue-2354-1.rs
index 996cf1bcbf9..996cf1bcbf9 100644
--- a/src/test/ui/parser/issue-2354-1.rs
+++ b/src/test/ui/parser/issues/issue-2354-1.rs
diff --git a/src/test/ui/parser/issue-2354-1.stderr b/src/test/ui/parser/issues/issue-2354-1.stderr
index 7ea0f2a9828..7ea0f2a9828 100644
--- a/src/test/ui/parser/issue-2354-1.stderr
+++ b/src/test/ui/parser/issues/issue-2354-1.stderr
diff --git a/src/test/ui/parser/issue-2354.rs b/src/test/ui/parser/issues/issue-2354.rs
index c422040cbe3..c422040cbe3 100644
--- a/src/test/ui/parser/issue-2354.rs
+++ b/src/test/ui/parser/issues/issue-2354.rs
diff --git a/src/test/ui/parser/issue-2354.stderr b/src/test/ui/parser/issues/issue-2354.stderr
index b89ed395835..b89ed395835 100644
--- a/src/test/ui/parser/issue-2354.stderr
+++ b/src/test/ui/parser/issues/issue-2354.stderr
diff --git a/src/test/ui/parser/issue-23620-invalid-escapes.rs b/src/test/ui/parser/issues/issue-23620-invalid-escapes.rs
index c1355f0d6fe..c1355f0d6fe 100644
--- a/src/test/ui/parser/issue-23620-invalid-escapes.rs
+++ b/src/test/ui/parser/issues/issue-23620-invalid-escapes.rs
diff --git a/src/test/ui/parser/issue-23620-invalid-escapes.stderr b/src/test/ui/parser/issues/issue-23620-invalid-escapes.stderr
index 88d97c795fc..88d97c795fc 100644
--- a/src/test/ui/parser/issue-23620-invalid-escapes.stderr
+++ b/src/test/ui/parser/issues/issue-23620-invalid-escapes.stderr
diff --git a/src/test/ui/parser/issue-24197.rs b/src/test/ui/parser/issues/issue-24197.rs
index aaf5137461f..aaf5137461f 100644
--- a/src/test/ui/parser/issue-24197.rs
+++ b/src/test/ui/parser/issues/issue-24197.rs
diff --git a/src/test/ui/parser/issue-24197.stderr b/src/test/ui/parser/issues/issue-24197.stderr
index fd7015ccd39..fd7015ccd39 100644
--- a/src/test/ui/parser/issue-24197.stderr
+++ b/src/test/ui/parser/issues/issue-24197.stderr
diff --git a/src/test/ui/parser/issue-24375.rs b/src/test/ui/parser/issues/issue-24375.rs
index 1d128d33e4f..1d128d33e4f 100644
--- a/src/test/ui/parser/issue-24375.rs
+++ b/src/test/ui/parser/issues/issue-24375.rs
diff --git a/src/test/ui/parser/issue-24375.stderr b/src/test/ui/parser/issues/issue-24375.stderr
index 7aed88768a0..7aed88768a0 100644
--- a/src/test/ui/parser/issue-24375.stderr
+++ b/src/test/ui/parser/issues/issue-24375.stderr
diff --git a/src/test/ui/parser/issue-24780.rs b/src/test/ui/parser/issues/issue-24780.rs
index 480d9bc2bad..480d9bc2bad 100644
--- a/src/test/ui/parser/issue-24780.rs
+++ b/src/test/ui/parser/issues/issue-24780.rs
diff --git a/src/test/ui/parser/issue-24780.stderr b/src/test/ui/parser/issues/issue-24780.stderr
index bdd089bb7a1..bdd089bb7a1 100644
--- a/src/test/ui/parser/issue-24780.stderr
+++ b/src/test/ui/parser/issues/issue-24780.stderr
diff --git a/src/test/ui/parser/issue-27255.rs b/src/test/ui/parser/issues/issue-27255.rs
index d619688e101..d619688e101 100644
--- a/src/test/ui/parser/issue-27255.rs
+++ b/src/test/ui/parser/issues/issue-27255.rs
diff --git a/src/test/ui/parser/issue-27255.stderr b/src/test/ui/parser/issues/issue-27255.stderr
index 391a23556c4..391a23556c4 100644
--- a/src/test/ui/parser/issue-27255.stderr
+++ b/src/test/ui/parser/issues/issue-27255.stderr
diff --git a/src/test/ui/parser/issue-30318.fixed b/src/test/ui/parser/issues/issue-30318.fixed
index 71fc82172a5..71fc82172a5 100644
--- a/src/test/ui/parser/issue-30318.fixed
+++ b/src/test/ui/parser/issues/issue-30318.fixed
diff --git a/src/test/ui/parser/issue-30318.rs b/src/test/ui/parser/issues/issue-30318.rs
index 465dca2ff82..465dca2ff82 100644
--- a/src/test/ui/parser/issue-30318.rs
+++ b/src/test/ui/parser/issues/issue-30318.rs
diff --git a/src/test/ui/parser/issue-30318.stderr b/src/test/ui/parser/issues/issue-30318.stderr
index 7e710884554..7e710884554 100644
--- a/src/test/ui/parser/issue-30318.stderr
+++ b/src/test/ui/parser/issues/issue-30318.stderr
diff --git a/src/test/ui/parser/issue-3036.fixed b/src/test/ui/parser/issues/issue-3036.fixed
index e5d5622e6fc..e5d5622e6fc 100644
--- a/src/test/ui/parser/issue-3036.fixed
+++ b/src/test/ui/parser/issues/issue-3036.fixed
diff --git a/src/test/ui/parser/issue-3036.rs b/src/test/ui/parser/issues/issue-3036.rs
index 2f76fb99b22..2f76fb99b22 100644
--- a/src/test/ui/parser/issue-3036.rs
+++ b/src/test/ui/parser/issues/issue-3036.rs
diff --git a/src/test/ui/parser/issue-3036.stderr b/src/test/ui/parser/issues/issue-3036.stderr
index e02223931c1..e02223931c1 100644
--- a/src/test/ui/parser/issue-3036.stderr
+++ b/src/test/ui/parser/issues/issue-3036.stderr
diff --git a/src/test/ui/parser/issue-31804.rs b/src/test/ui/parser/issues/issue-31804.rs
index d056b77cf09..d056b77cf09 100644
--- a/src/test/ui/parser/issue-31804.rs
+++ b/src/test/ui/parser/issues/issue-31804.rs
diff --git a/src/test/ui/parser/issue-31804.stderr b/src/test/ui/parser/issues/issue-31804.stderr
index 76e68b0b352..76e68b0b352 100644
--- a/src/test/ui/parser/issue-31804.stderr
+++ b/src/test/ui/parser/issues/issue-31804.stderr
diff --git a/src/test/ui/parser/issue-32214.rs b/src/test/ui/parser/issues/issue-32214.rs
index 1379eeb58e6..1379eeb58e6 100644
--- a/src/test/ui/parser/issue-32214.rs
+++ b/src/test/ui/parser/issues/issue-32214.rs
diff --git a/src/test/ui/parser/issue-32214.stderr b/src/test/ui/parser/issues/issue-32214.stderr
index d0a9b529983..d0a9b529983 100644
--- a/src/test/ui/parser/issue-32214.stderr
+++ b/src/test/ui/parser/issues/issue-32214.stderr
diff --git a/src/test/ui/parser/issue-32446.rs b/src/test/ui/parser/issues/issue-32446.rs
index 53e519a72a5..53e519a72a5 100644
--- a/src/test/ui/parser/issue-32446.rs
+++ b/src/test/ui/parser/issues/issue-32446.rs
diff --git a/src/test/ui/parser/issue-32446.stderr b/src/test/ui/parser/issues/issue-32446.stderr
index 7515369aaa0..7515369aaa0 100644
--- a/src/test/ui/parser/issue-32446.stderr
+++ b/src/test/ui/parser/issues/issue-32446.stderr
diff --git a/src/test/ui/parser/issue-32501.rs b/src/test/ui/parser/issues/issue-32501.rs
index 500242030c6..500242030c6 100644
--- a/src/test/ui/parser/issue-32501.rs
+++ b/src/test/ui/parser/issues/issue-32501.rs
diff --git a/src/test/ui/parser/issue-32501.stderr b/src/test/ui/parser/issues/issue-32501.stderr
index d53302449a8..d53302449a8 100644
--- a/src/test/ui/parser/issue-32501.stderr
+++ b/src/test/ui/parser/issues/issue-32501.stderr
diff --git a/src/test/ui/parser/issue-32505.rs b/src/test/ui/parser/issues/issue-32505.rs
index f31c00e5cc3..f31c00e5cc3 100644
--- a/src/test/ui/parser/issue-32505.rs
+++ b/src/test/ui/parser/issues/issue-32505.rs
diff --git a/src/test/ui/parser/issue-32505.stderr b/src/test/ui/parser/issues/issue-32505.stderr
index cdd779a93ef..cdd779a93ef 100644
--- a/src/test/ui/parser/issue-32505.stderr
+++ b/src/test/ui/parser/issues/issue-32505.stderr
diff --git a/src/test/ui/parser/issue-33262.rs b/src/test/ui/parser/issues/issue-33262.rs
index 3a612f95c03..3a612f95c03 100644
--- a/src/test/ui/parser/issue-33262.rs
+++ b/src/test/ui/parser/issues/issue-33262.rs
diff --git a/src/test/ui/parser/issue-33262.stderr b/src/test/ui/parser/issues/issue-33262.stderr
index 2aff3283935..2aff3283935 100644
--- a/src/test/ui/parser/issue-33262.stderr
+++ b/src/test/ui/parser/issues/issue-33262.stderr
diff --git a/src/test/ui/parser/issue-33413.rs b/src/test/ui/parser/issues/issue-33413.rs
index 7291732cebe..7291732cebe 100644
--- a/src/test/ui/parser/issue-33413.rs
+++ b/src/test/ui/parser/issues/issue-33413.rs
diff --git a/src/test/ui/parser/issue-33413.stderr b/src/test/ui/parser/issues/issue-33413.stderr
index ac320f095a2..ac320f095a2 100644
--- a/src/test/ui/parser/issue-33413.stderr
+++ b/src/test/ui/parser/issues/issue-33413.stderr
diff --git a/src/test/ui/parser/issue-33418.fixed b/src/test/ui/parser/issues/issue-33418.fixed
index ed885ae1435..ed885ae1435 100644
--- a/src/test/ui/parser/issue-33418.fixed
+++ b/src/test/ui/parser/issues/issue-33418.fixed
diff --git a/src/test/ui/parser/issue-33418.rs b/src/test/ui/parser/issues/issue-33418.rs
index 9934284abfb..9934284abfb 100644
--- a/src/test/ui/parser/issue-33418.rs
+++ b/src/test/ui/parser/issues/issue-33418.rs
diff --git a/src/test/ui/parser/issue-33418.stderr b/src/test/ui/parser/issues/issue-33418.stderr
index 9a8733e8929..9a8733e8929 100644
--- a/src/test/ui/parser/issue-33418.stderr
+++ b/src/test/ui/parser/issues/issue-33418.stderr
diff --git a/src/test/ui/parser/issue-33455.rs b/src/test/ui/parser/issues/issue-33455.rs
index 6dff63f5cf4..6dff63f5cf4 100644
--- a/src/test/ui/parser/issue-33455.rs
+++ b/src/test/ui/parser/issues/issue-33455.rs
diff --git a/src/test/ui/parser/issue-33455.stderr b/src/test/ui/parser/issues/issue-33455.stderr
index c535ef23b22..c535ef23b22 100644
--- a/src/test/ui/parser/issue-33455.stderr
+++ b/src/test/ui/parser/issues/issue-33455.stderr
diff --git a/src/test/ui/parser/issue-34222-1.rs b/src/test/ui/parser/issues/issue-34222-1.rs
index d36dddc97bb..d36dddc97bb 100644
--- a/src/test/ui/parser/issue-34222-1.rs
+++ b/src/test/ui/parser/issues/issue-34222-1.rs
diff --git a/src/test/ui/parser/issue-34222-1.stderr b/src/test/ui/parser/issues/issue-34222-1.stderr
index 0799656b06b..0799656b06b 100644
--- a/src/test/ui/parser/issue-34222-1.stderr
+++ b/src/test/ui/parser/issues/issue-34222-1.stderr
diff --git a/src/test/ui/parser/issue-34255-1.rs b/src/test/ui/parser/issues/issue-34255-1.rs
index c70cd8b5077..c70cd8b5077 100644
--- a/src/test/ui/parser/issue-34255-1.rs
+++ b/src/test/ui/parser/issues/issue-34255-1.rs
diff --git a/src/test/ui/parser/issue-34255-1.stderr b/src/test/ui/parser/issues/issue-34255-1.stderr
index fbff75e37d9..fbff75e37d9 100644
--- a/src/test/ui/parser/issue-34255-1.stderr
+++ b/src/test/ui/parser/issues/issue-34255-1.stderr
diff --git a/src/test/ui/parser/issue-35813-postfix-after-cast.rs b/src/test/ui/parser/issues/issue-35813-postfix-after-cast.rs
index e725aa5d73d..e725aa5d73d 100644
--- a/src/test/ui/parser/issue-35813-postfix-after-cast.rs
+++ b/src/test/ui/parser/issues/issue-35813-postfix-after-cast.rs
diff --git a/src/test/ui/parser/issue-35813-postfix-after-cast.stderr b/src/test/ui/parser/issues/issue-35813-postfix-after-cast.stderr
index 19b68556d79..19b68556d79 100644
--- a/src/test/ui/parser/issue-35813-postfix-after-cast.stderr
+++ b/src/test/ui/parser/issues/issue-35813-postfix-after-cast.stderr
diff --git a/src/test/ui/parser/issue-41155.rs b/src/test/ui/parser/issues/issue-41155.rs
index 5a7488e6ffc..5a7488e6ffc 100644
--- a/src/test/ui/parser/issue-41155.rs
+++ b/src/test/ui/parser/issues/issue-41155.rs
diff --git a/src/test/ui/parser/issue-41155.stderr b/src/test/ui/parser/issues/issue-41155.stderr
index 8491afae230..8491afae230 100644
--- a/src/test/ui/parser/issue-41155.stderr
+++ b/src/test/ui/parser/issues/issue-41155.stderr
diff --git a/src/test/ui/parser/issue-43196.rs b/src/test/ui/parser/issues/issue-43196.rs
index 0eefa01ce6d..0eefa01ce6d 100644
--- a/src/test/ui/parser/issue-43196.rs
+++ b/src/test/ui/parser/issues/issue-43196.rs
diff --git a/src/test/ui/parser/issue-43196.stderr b/src/test/ui/parser/issues/issue-43196.stderr
index 4f7ed5cc6fd..4f7ed5cc6fd 100644
--- a/src/test/ui/parser/issue-43196.stderr
+++ b/src/test/ui/parser/issues/issue-43196.stderr
diff --git a/src/test/ui/parser/issue-43692.rs b/src/test/ui/parser/issues/issue-43692.rs
index baf8bafb8b7..baf8bafb8b7 100644
--- a/src/test/ui/parser/issue-43692.rs
+++ b/src/test/ui/parser/issues/issue-43692.rs
diff --git a/src/test/ui/parser/issue-43692.stderr b/src/test/ui/parser/issues/issue-43692.stderr
index baf99803517..baf99803517 100644
--- a/src/test/ui/parser/issue-43692.stderr
+++ b/src/test/ui/parser/issues/issue-43692.stderr
diff --git a/src/test/ui/parser/issue-44021.rs b/src/test/ui/parser/issues/issue-44021.rs
index 0b9558cc91e..0b9558cc91e 100644
--- a/src/test/ui/parser/issue-44021.rs
+++ b/src/test/ui/parser/issues/issue-44021.rs
diff --git a/src/test/ui/parser/issue-44021.stderr b/src/test/ui/parser/issues/issue-44021.stderr
index b888cd989a6..b888cd989a6 100644
--- a/src/test/ui/parser/issue-44021.stderr
+++ b/src/test/ui/parser/issues/issue-44021.stderr
diff --git a/src/test/ui/parser/issue-44406.rs b/src/test/ui/parser/issues/issue-44406.rs
index a5b7e83a016..a5b7e83a016 100644
--- a/src/test/ui/parser/issue-44406.rs
+++ b/src/test/ui/parser/issues/issue-44406.rs
diff --git a/src/test/ui/parser/issue-44406.stderr b/src/test/ui/parser/issues/issue-44406.stderr
index 61419040b33..61419040b33 100644
--- a/src/test/ui/parser/issue-44406.stderr
+++ b/src/test/ui/parser/issues/issue-44406.stderr
diff --git a/src/test/ui/parser/issue-45296.rs b/src/test/ui/parser/issues/issue-45296.rs
index d3a97e89f9a..d3a97e89f9a 100644
--- a/src/test/ui/parser/issue-45296.rs
+++ b/src/test/ui/parser/issues/issue-45296.rs
diff --git a/src/test/ui/parser/issue-45296.stderr b/src/test/ui/parser/issues/issue-45296.stderr
index 6abe266d4e9..6abe266d4e9 100644
--- a/src/test/ui/parser/issue-45296.stderr
+++ b/src/test/ui/parser/issues/issue-45296.stderr
diff --git a/src/test/ui/parser/issue-46186.fixed b/src/test/ui/parser/issues/issue-46186.fixed
index 2cb5a4996ee..2cb5a4996ee 100644
--- a/src/test/ui/parser/issue-46186.fixed
+++ b/src/test/ui/parser/issues/issue-46186.fixed
diff --git a/src/test/ui/parser/issue-46186.rs b/src/test/ui/parser/issues/issue-46186.rs
index 84cad38c5ec..84cad38c5ec 100644
--- a/src/test/ui/parser/issue-46186.rs
+++ b/src/test/ui/parser/issues/issue-46186.rs
diff --git a/src/test/ui/parser/issue-46186.stderr b/src/test/ui/parser/issues/issue-46186.stderr
index 0766c8a33df..0766c8a33df 100644
--- a/src/test/ui/parser/issue-46186.stderr
+++ b/src/test/ui/parser/issues/issue-46186.stderr
diff --git a/src/test/ui/parser/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.rs b/src/test/ui/parser/issues/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.rs
index 48a679b2d09..48a679b2d09 100644
--- a/src/test/ui/parser/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.rs
+++ b/src/test/ui/parser/issues/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.rs
diff --git a/src/test/ui/parser/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.stderr b/src/test/ui/parser/issues/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.stderr
index fdef8ff6df9..fdef8ff6df9 100644
--- a/src/test/ui/parser/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.stderr
+++ b/src/test/ui/parser/issues/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.stderr
diff --git a/src/test/ui/parser/issue-48137-macros-cannot-interpolate-impl-items.rs b/src/test/ui/parser/issues/issue-48137-macros-cannot-interpolate-impl-items.rs
index 8592f8a7287..8592f8a7287 100644
--- a/src/test/ui/parser/issue-48137-macros-cannot-interpolate-impl-items.rs
+++ b/src/test/ui/parser/issues/issue-48137-macros-cannot-interpolate-impl-items.rs
diff --git a/src/test/ui/parser/issue-48508-aux.rs b/src/test/ui/parser/issues/issue-48508-aux.rs
index ebdc70a04df..ebdc70a04df 100644
--- a/src/test/ui/parser/issue-48508-aux.rs
+++ b/src/test/ui/parser/issues/issue-48508-aux.rs
diff --git a/src/test/ui/parser/issue-48508.rs b/src/test/ui/parser/issues/issue-48508.rs
index 37d04c5d65f..37d04c5d65f 100644
--- a/src/test/ui/parser/issue-48508.rs
+++ b/src/test/ui/parser/issues/issue-48508.rs
diff --git a/src/test/ui/parser/issue-48636.fixed b/src/test/ui/parser/issues/issue-48636.fixed
index 87c19a32d4c..87c19a32d4c 100644
--- a/src/test/ui/parser/issue-48636.fixed
+++ b/src/test/ui/parser/issues/issue-48636.fixed
diff --git a/src/test/ui/parser/issue-48636.rs b/src/test/ui/parser/issues/issue-48636.rs
index 8610dc2f72e..8610dc2f72e 100644
--- a/src/test/ui/parser/issue-48636.rs
+++ b/src/test/ui/parser/issues/issue-48636.rs
diff --git a/src/test/ui/parser/issue-48636.stderr b/src/test/ui/parser/issues/issue-48636.stderr
index 462723d1d93..462723d1d93 100644
--- a/src/test/ui/parser/issue-48636.stderr
+++ b/src/test/ui/parser/issues/issue-48636.stderr
diff --git a/src/test/ui/parser/issue-49040.rs b/src/test/ui/parser/issues/issue-49040.rs
index b7a541dd664..b7a541dd664 100644
--- a/src/test/ui/parser/issue-49040.rs
+++ b/src/test/ui/parser/issues/issue-49040.rs
diff --git a/src/test/ui/parser/issue-49040.stderr b/src/test/ui/parser/issues/issue-49040.stderr
index 56befe3a0a7..56befe3a0a7 100644
--- a/src/test/ui/parser/issue-49040.stderr
+++ b/src/test/ui/parser/issues/issue-49040.stderr
diff --git a/src/test/ui/parser/issue-51602.rs b/src/test/ui/parser/issues/issue-51602.rs
index 0e96ca914a9..0e96ca914a9 100644
--- a/src/test/ui/parser/issue-51602.rs
+++ b/src/test/ui/parser/issues/issue-51602.rs
diff --git a/src/test/ui/parser/issue-51602.stderr b/src/test/ui/parser/issues/issue-51602.stderr
index d800890bca3..d800890bca3 100644
--- a/src/test/ui/parser/issue-51602.stderr
+++ b/src/test/ui/parser/issues/issue-51602.stderr
diff --git a/src/test/ui/parser/issue-52496.rs b/src/test/ui/parser/issues/issue-52496.rs
index 05461f8b8c4..05461f8b8c4 100644
--- a/src/test/ui/parser/issue-52496.rs
+++ b/src/test/ui/parser/issues/issue-52496.rs
diff --git a/src/test/ui/parser/issue-52496.stderr b/src/test/ui/parser/issues/issue-52496.stderr
index 9dbf26ef4b6..9dbf26ef4b6 100644
--- a/src/test/ui/parser/issue-52496.stderr
+++ b/src/test/ui/parser/issues/issue-52496.stderr
diff --git a/src/test/ui/parser/issue-54521-1.rs b/src/test/ui/parser/issues/issue-54521-1.rs
index 8a682ef0a11..8a682ef0a11 100644
--- a/src/test/ui/parser/issue-54521-1.rs
+++ b/src/test/ui/parser/issues/issue-54521-1.rs
diff --git a/src/test/ui/parser/issue-54521-2.fixed b/src/test/ui/parser/issues/issue-54521-2.fixed
index a91c4fe43ea..a91c4fe43ea 100644
--- a/src/test/ui/parser/issue-54521-2.fixed
+++ b/src/test/ui/parser/issues/issue-54521-2.fixed
diff --git a/src/test/ui/parser/issue-54521-2.rs b/src/test/ui/parser/issues/issue-54521-2.rs
index 3639aac87ee..3639aac87ee 100644
--- a/src/test/ui/parser/issue-54521-2.rs
+++ b/src/test/ui/parser/issues/issue-54521-2.rs
diff --git a/src/test/ui/parser/issue-54521-2.stderr b/src/test/ui/parser/issues/issue-54521-2.stderr
index 9556b83b730..9556b83b730 100644
--- a/src/test/ui/parser/issue-54521-2.stderr
+++ b/src/test/ui/parser/issues/issue-54521-2.stderr
diff --git a/src/test/ui/parser/issue-54521-3.fixed b/src/test/ui/parser/issues/issue-54521-3.fixed
index 84ab6866cf1..84ab6866cf1 100644
--- a/src/test/ui/parser/issue-54521-3.fixed
+++ b/src/test/ui/parser/issues/issue-54521-3.fixed
diff --git a/src/test/ui/parser/issue-54521-3.rs b/src/test/ui/parser/issues/issue-54521-3.rs
index f1d68504178..f1d68504178 100644
--- a/src/test/ui/parser/issue-54521-3.rs
+++ b/src/test/ui/parser/issues/issue-54521-3.rs
diff --git a/src/test/ui/parser/issue-54521-3.stderr b/src/test/ui/parser/issues/issue-54521-3.stderr
index 0f23dd62107..0f23dd62107 100644
--- a/src/test/ui/parser/issue-54521-3.stderr
+++ b/src/test/ui/parser/issues/issue-54521-3.stderr
diff --git a/src/test/ui/parser/issue-5544-a.rs b/src/test/ui/parser/issues/issue-5544-a.rs
index 3c239c73b9d..3c239c73b9d 100644
--- a/src/test/ui/parser/issue-5544-a.rs
+++ b/src/test/ui/parser/issues/issue-5544-a.rs
diff --git a/src/test/ui/parser/issue-5544-a.stderr b/src/test/ui/parser/issues/issue-5544-a.stderr
index de579c3c134..de579c3c134 100644
--- a/src/test/ui/parser/issue-5544-a.stderr
+++ b/src/test/ui/parser/issues/issue-5544-a.stderr
diff --git a/src/test/ui/parser/issue-5544-b.rs b/src/test/ui/parser/issues/issue-5544-b.rs
index 93f2ff27136..93f2ff27136 100644
--- a/src/test/ui/parser/issue-5544-b.rs
+++ b/src/test/ui/parser/issues/issue-5544-b.rs
diff --git a/src/test/ui/parser/issue-5544-b.stderr b/src/test/ui/parser/issues/issue-5544-b.stderr
index 7df212dedfe..7df212dedfe 100644
--- a/src/test/ui/parser/issue-5544-b.stderr
+++ b/src/test/ui/parser/issues/issue-5544-b.stderr
diff --git a/src/test/ui/parser/issue-56031.rs b/src/test/ui/parser/issues/issue-56031.rs
index b68f5681467..b68f5681467 100644
--- a/src/test/ui/parser/issue-56031.rs
+++ b/src/test/ui/parser/issues/issue-56031.rs
diff --git a/src/test/ui/parser/issue-56031.stderr b/src/test/ui/parser/issues/issue-56031.stderr
index 7ee5bc6ec61..7ee5bc6ec61 100644
--- a/src/test/ui/parser/issue-56031.stderr
+++ b/src/test/ui/parser/issues/issue-56031.stderr
diff --git a/src/test/ui/parser/issue-57198.rs b/src/test/ui/parser/issues/issue-57198.rs
index 714a46cbc9f..714a46cbc9f 100644
--- a/src/test/ui/parser/issue-57198.rs
+++ b/src/test/ui/parser/issues/issue-57198.rs
diff --git a/src/test/ui/parser/issue-57198.stderr b/src/test/ui/parser/issues/issue-57198.stderr
index 5a56d80a7d7..5a56d80a7d7 100644
--- a/src/test/ui/parser/issue-57198.stderr
+++ b/src/test/ui/parser/issues/issue-57198.stderr
diff --git a/src/test/ui/parser/issue-57684.fixed b/src/test/ui/parser/issues/issue-57684.fixed
index 4a432206d51..4a432206d51 100644
--- a/src/test/ui/parser/issue-57684.fixed
+++ b/src/test/ui/parser/issues/issue-57684.fixed
diff --git a/src/test/ui/parser/issue-57684.rs b/src/test/ui/parser/issues/issue-57684.rs
index 7a62785e32f..7a62785e32f 100644
--- a/src/test/ui/parser/issue-57684.rs
+++ b/src/test/ui/parser/issues/issue-57684.rs
diff --git a/src/test/ui/parser/issue-57684.stderr b/src/test/ui/parser/issues/issue-57684.stderr
index 514bbffde6b..514bbffde6b 100644
--- a/src/test/ui/parser/issue-57684.stderr
+++ b/src/test/ui/parser/issues/issue-57684.stderr
diff --git a/src/test/ui/parser/issue-57819.fixed b/src/test/ui/parser/issues/issue-57819.fixed
index 3fab21db2d0..3fab21db2d0 100644
--- a/src/test/ui/parser/issue-57819.fixed
+++ b/src/test/ui/parser/issues/issue-57819.fixed
diff --git a/src/test/ui/parser/issue-57819.rs b/src/test/ui/parser/issues/issue-57819.rs
index 5cafbf439be..5cafbf439be 100644
--- a/src/test/ui/parser/issue-57819.rs
+++ b/src/test/ui/parser/issues/issue-57819.rs
diff --git a/src/test/ui/parser/issue-57819.stderr b/src/test/ui/parser/issues/issue-57819.stderr
index 493e9835b1c..493e9835b1c 100644
--- a/src/test/ui/parser/issue-57819.stderr
+++ b/src/test/ui/parser/issues/issue-57819.stderr
diff --git a/src/test/ui/parser/issue-5806.rs b/src/test/ui/parser/issues/issue-5806.rs
index b694642a9c5..b694642a9c5 100644
--- a/src/test/ui/parser/issue-5806.rs
+++ b/src/test/ui/parser/issues/issue-5806.rs
diff --git a/src/test/ui/parser/issue-5806.stderr b/src/test/ui/parser/issues/issue-5806.stderr
index bdb5c91ff91..bdb5c91ff91 100644
--- a/src/test/ui/parser/issue-5806.stderr
+++ b/src/test/ui/parser/issues/issue-5806.stderr
diff --git a/src/test/ui/parser/issue-58094-missing-right-square-bracket.rs b/src/test/ui/parser/issues/issue-58094-missing-right-square-bracket.rs
index 25699f9fe11..25699f9fe11 100644
--- a/src/test/ui/parser/issue-58094-missing-right-square-bracket.rs
+++ b/src/test/ui/parser/issues/issue-58094-missing-right-square-bracket.rs
diff --git a/src/test/ui/parser/issue-58094-missing-right-square-bracket.stderr b/src/test/ui/parser/issues/issue-58094-missing-right-square-bracket.stderr
index 8a44ee761ed..8a44ee761ed 100644
--- a/src/test/ui/parser/issue-58094-missing-right-square-bracket.stderr
+++ b/src/test/ui/parser/issues/issue-58094-missing-right-square-bracket.stderr
diff --git a/src/test/ui/parser/issue-58856-1.rs b/src/test/ui/parser/issues/issue-58856-1.rs
index 332a3014416..332a3014416 100644
--- a/src/test/ui/parser/issue-58856-1.rs
+++ b/src/test/ui/parser/issues/issue-58856-1.rs
diff --git a/src/test/ui/parser/issue-58856-1.stderr b/src/test/ui/parser/issues/issue-58856-1.stderr
index 2afb26d1758..2afb26d1758 100644
--- a/src/test/ui/parser/issue-58856-1.stderr
+++ b/src/test/ui/parser/issues/issue-58856-1.stderr
diff --git a/src/test/ui/parser/issue-58856-2.rs b/src/test/ui/parser/issues/issue-58856-2.rs
index 9356d57b0e5..9356d57b0e5 100644
--- a/src/test/ui/parser/issue-58856-2.rs
+++ b/src/test/ui/parser/issues/issue-58856-2.rs
diff --git a/src/test/ui/parser/issue-58856-2.stderr b/src/test/ui/parser/issues/issue-58856-2.stderr
index 627dd389059..627dd389059 100644
--- a/src/test/ui/parser/issue-58856-2.stderr
+++ b/src/test/ui/parser/issues/issue-58856-2.stderr
diff --git a/src/test/ui/parser/issue-59418.rs b/src/test/ui/parser/issues/issue-59418.rs
index 0fa191d4a7e..0fa191d4a7e 100644
--- a/src/test/ui/parser/issue-59418.rs
+++ b/src/test/ui/parser/issues/issue-59418.rs
diff --git a/src/test/ui/parser/issue-59418.stderr b/src/test/ui/parser/issues/issue-59418.stderr
index 347051e9f92..347051e9f92 100644
--- a/src/test/ui/parser/issue-59418.stderr
+++ b/src/test/ui/parser/issues/issue-59418.stderr
diff --git a/src/test/ui/parser/issue-60075.rs b/src/test/ui/parser/issues/issue-60075.rs
index e89d78ee8a6..e89d78ee8a6 100644
--- a/src/test/ui/parser/issue-60075.rs
+++ b/src/test/ui/parser/issues/issue-60075.rs
diff --git a/src/test/ui/parser/issue-60075.stderr b/src/test/ui/parser/issues/issue-60075.stderr
index 210ef700cd4..210ef700cd4 100644
--- a/src/test/ui/parser/issue-60075.stderr
+++ b/src/test/ui/parser/issues/issue-60075.stderr
diff --git a/src/test/ui/parser/issue-62524.rs b/src/test/ui/parser/issues/issue-62524.rs
index 5259dfe2e65..5259dfe2e65 100644
--- a/src/test/ui/parser/issue-62524.rs
+++ b/src/test/ui/parser/issues/issue-62524.rs
diff --git a/src/test/ui/parser/issue-62524.stderr b/src/test/ui/parser/issues/issue-62524.stderr
index 55eed0402a4..55eed0402a4 100644
--- a/src/test/ui/parser/issue-62524.stderr
+++ b/src/test/ui/parser/issues/issue-62524.stderr
diff --git a/src/test/ui/parser/issue-62546.rs b/src/test/ui/parser/issues/issue-62546.rs
index f06b6505859..f06b6505859 100644
--- a/src/test/ui/parser/issue-62546.rs
+++ b/src/test/ui/parser/issues/issue-62546.rs
diff --git a/src/test/ui/parser/issue-62546.stderr b/src/test/ui/parser/issues/issue-62546.stderr
index 32c61391e16..32c61391e16 100644
--- a/src/test/ui/parser/issue-62546.stderr
+++ b/src/test/ui/parser/issues/issue-62546.stderr
diff --git a/src/test/ui/parser/issue-62554.rs b/src/test/ui/parser/issues/issue-62554.rs
index cfd02183cb4..cfd02183cb4 100644
--- a/src/test/ui/parser/issue-62554.rs
+++ b/src/test/ui/parser/issues/issue-62554.rs
diff --git a/src/test/ui/parser/issue-62554.stderr b/src/test/ui/parser/issues/issue-62554.stderr
index 5dc9a9675bc..5dc9a9675bc 100644
--- a/src/test/ui/parser/issue-62554.stderr
+++ b/src/test/ui/parser/issues/issue-62554.stderr
diff --git a/src/test/ui/parser/issue-62660.rs b/src/test/ui/parser/issues/issue-62660.rs
index 4f866b78976..4f866b78976 100644
--- a/src/test/ui/parser/issue-62660.rs
+++ b/src/test/ui/parser/issues/issue-62660.rs
diff --git a/src/test/ui/parser/issue-62660.stderr b/src/test/ui/parser/issues/issue-62660.stderr
index a50ada9056b..a50ada9056b 100644
--- a/src/test/ui/parser/issue-62660.stderr
+++ b/src/test/ui/parser/issues/issue-62660.stderr
diff --git a/src/test/ui/parser/issue-62881.rs b/src/test/ui/parser/issues/issue-62881.rs
index b9204595fb9..b9204595fb9 100644
--- a/src/test/ui/parser/issue-62881.rs
+++ b/src/test/ui/parser/issues/issue-62881.rs
diff --git a/src/test/ui/parser/issue-62881.stderr b/src/test/ui/parser/issues/issue-62881.stderr
index 87be69baadd..87be69baadd 100644
--- a/src/test/ui/parser/issue-62881.stderr
+++ b/src/test/ui/parser/issues/issue-62881.stderr
diff --git a/src/test/ui/parser/issue-62894.rs b/src/test/ui/parser/issues/issue-62894.rs
index b9c0bf834dd..b9c0bf834dd 100644
--- a/src/test/ui/parser/issue-62894.rs
+++ b/src/test/ui/parser/issues/issue-62894.rs
diff --git a/src/test/ui/parser/issue-62894.stderr b/src/test/ui/parser/issues/issue-62894.stderr
index 9b7bd1559cd..9b7bd1559cd 100644
--- a/src/test/ui/parser/issue-62894.stderr
+++ b/src/test/ui/parser/issues/issue-62894.stderr
diff --git a/src/test/ui/parser/issue-62895.rs b/src/test/ui/parser/issues/issue-62895.rs
index 53f17405d79..53f17405d79 100644
--- a/src/test/ui/parser/issue-62895.rs
+++ b/src/test/ui/parser/issues/issue-62895.rs
diff --git a/src/test/ui/parser/issue-62895.stderr b/src/test/ui/parser/issues/issue-62895.stderr
index 2e7e500f478..2e7e500f478 100644
--- a/src/test/ui/parser/issue-62895.stderr
+++ b/src/test/ui/parser/issues/issue-62895.stderr
diff --git a/src/test/ui/parser/issue-62913.rs b/src/test/ui/parser/issues/issue-62913.rs
index 0db06f636c3..0db06f636c3 100644
--- a/src/test/ui/parser/issue-62913.rs
+++ b/src/test/ui/parser/issues/issue-62913.rs
diff --git a/src/test/ui/parser/issue-62913.stderr b/src/test/ui/parser/issues/issue-62913.stderr
index 6f385e8dc17..6f385e8dc17 100644
--- a/src/test/ui/parser/issue-62913.stderr
+++ b/src/test/ui/parser/issues/issue-62913.stderr
diff --git a/src/test/ui/parser/issue-62973.rs b/src/test/ui/parser/issues/issue-62973.rs
index 1c5d0c6f8ab..1c5d0c6f8ab 100644
--- a/src/test/ui/parser/issue-62973.rs
+++ b/src/test/ui/parser/issues/issue-62973.rs
diff --git a/src/test/ui/parser/issue-62973.stderr b/src/test/ui/parser/issues/issue-62973.stderr
index 51d835e7329..51d835e7329 100644
--- a/src/test/ui/parser/issue-62973.stderr
+++ b/src/test/ui/parser/issues/issue-62973.stderr
diff --git a/src/test/ui/parser/issue-63115-range-pat-interpolated.rs b/src/test/ui/parser/issues/issue-63115-range-pat-interpolated.rs
index 8efb3c73f03..8efb3c73f03 100644
--- a/src/test/ui/parser/issue-63115-range-pat-interpolated.rs
+++ b/src/test/ui/parser/issues/issue-63115-range-pat-interpolated.rs
diff --git a/src/test/ui/parser/issue-63116.rs b/src/test/ui/parser/issues/issue-63116.rs
index 430bc1d716c..430bc1d716c 100644
--- a/src/test/ui/parser/issue-63116.rs
+++ b/src/test/ui/parser/issues/issue-63116.rs
diff --git a/src/test/ui/parser/issue-63116.stderr b/src/test/ui/parser/issues/issue-63116.stderr
index cfdd99d1434..cfdd99d1434 100644
--- a/src/test/ui/parser/issue-63116.stderr
+++ b/src/test/ui/parser/issues/issue-63116.stderr
diff --git a/src/test/ui/parser/issue-63135.rs b/src/test/ui/parser/issues/issue-63135.rs
index a5a8de85466..a5a8de85466 100644
--- a/src/test/ui/parser/issue-63135.rs
+++ b/src/test/ui/parser/issues/issue-63135.rs
diff --git a/src/test/ui/parser/issue-63135.stderr b/src/test/ui/parser/issues/issue-63135.stderr
index 80e9ac5bedf..80e9ac5bedf 100644
--- a/src/test/ui/parser/issue-63135.stderr
+++ b/src/test/ui/parser/issues/issue-63135.stderr
diff --git a/src/test/ui/parser/issue-64732.rs b/src/test/ui/parser/issues/issue-64732.rs
index 2db51ea6042..2db51ea6042 100644
--- a/src/test/ui/parser/issue-64732.rs
+++ b/src/test/ui/parser/issues/issue-64732.rs
diff --git a/src/test/ui/parser/issue-64732.stderr b/src/test/ui/parser/issues/issue-64732.stderr
index 80462549377..80462549377 100644
--- a/src/test/ui/parser/issue-64732.stderr
+++ b/src/test/ui/parser/issues/issue-64732.stderr
diff --git a/src/test/ui/parser/issue-65041-empty-vis-matcher-in-enum.rs b/src/test/ui/parser/issues/issue-65041-empty-vis-matcher-in-enum.rs
index ef89e31d842..ef89e31d842 100644
--- a/src/test/ui/parser/issue-65041-empty-vis-matcher-in-enum.rs
+++ b/src/test/ui/parser/issues/issue-65041-empty-vis-matcher-in-enum.rs
diff --git a/src/test/ui/parser/issue-65041-empty-vis-matcher-in-trait.rs b/src/test/ui/parser/issues/issue-65041-empty-vis-matcher-in-trait.rs
index b08767b210b..b08767b210b 100644
--- a/src/test/ui/parser/issue-65041-empty-vis-matcher-in-trait.rs
+++ b/src/test/ui/parser/issues/issue-65041-empty-vis-matcher-in-trait.rs
diff --git a/src/test/ui/parser/issue-65122-mac-invoc-in-mut-patterns.rs b/src/test/ui/parser/issues/issue-65122-mac-invoc-in-mut-patterns.rs
index 30f3781bf77..30f3781bf77 100644
--- a/src/test/ui/parser/issue-65122-mac-invoc-in-mut-patterns.rs
+++ b/src/test/ui/parser/issues/issue-65122-mac-invoc-in-mut-patterns.rs
diff --git a/src/test/ui/parser/issue-65122-mac-invoc-in-mut-patterns.stderr b/src/test/ui/parser/issues/issue-65122-mac-invoc-in-mut-patterns.stderr
index 8c032e588e3..8c032e588e3 100644
--- a/src/test/ui/parser/issue-65122-mac-invoc-in-mut-patterns.stderr
+++ b/src/test/ui/parser/issues/issue-65122-mac-invoc-in-mut-patterns.stderr
diff --git a/src/test/ui/parser/issue-65257-invalid-var-decl-recovery.rs b/src/test/ui/parser/issues/issue-65257-invalid-var-decl-recovery.rs
index c1826f8caae..c1826f8caae 100644
--- a/src/test/ui/parser/issue-65257-invalid-var-decl-recovery.rs
+++ b/src/test/ui/parser/issues/issue-65257-invalid-var-decl-recovery.rs
diff --git a/src/test/ui/parser/issue-65257-invalid-var-decl-recovery.stderr b/src/test/ui/parser/issues/issue-65257-invalid-var-decl-recovery.stderr
index 0a88dd2c4d3..0a88dd2c4d3 100644
--- a/src/test/ui/parser/issue-65257-invalid-var-decl-recovery.stderr
+++ b/src/test/ui/parser/issues/issue-65257-invalid-var-decl-recovery.stderr
diff --git a/src/test/ui/parser/issue-65846-rollback-gating-failing-matcher.rs b/src/test/ui/parser/issues/issue-65846-rollback-gating-failing-matcher.rs
index 9d68a7bffde..9d68a7bffde 100644
--- a/src/test/ui/parser/issue-65846-rollback-gating-failing-matcher.rs
+++ b/src/test/ui/parser/issues/issue-65846-rollback-gating-failing-matcher.rs
diff --git a/src/test/ui/parser/issue-6610.rs b/src/test/ui/parser/issues/issue-6610.rs
index 9ed5a61220b..9ed5a61220b 100644
--- a/src/test/ui/parser/issue-6610.rs
+++ b/src/test/ui/parser/issues/issue-6610.rs
diff --git a/src/test/ui/parser/issue-6610.stderr b/src/test/ui/parser/issues/issue-6610.stderr
index 4a3bc752553..4a3bc752553 100644
--- a/src/test/ui/parser/issue-6610.stderr
+++ b/src/test/ui/parser/issues/issue-6610.stderr
diff --git a/src/test/ui/parser/issue-66357-unexpected-unreachable.rs b/src/test/ui/parser/issues/issue-66357-unexpected-unreachable.rs
index aed428bfc2a..aed428bfc2a 100644
--- a/src/test/ui/parser/issue-66357-unexpected-unreachable.rs
+++ b/src/test/ui/parser/issues/issue-66357-unexpected-unreachable.rs
diff --git a/src/test/ui/parser/issue-66357-unexpected-unreachable.stderr b/src/test/ui/parser/issues/issue-66357-unexpected-unreachable.stderr
index 6cbab855c76..6cbab855c76 100644
--- a/src/test/ui/parser/issue-66357-unexpected-unreachable.stderr
+++ b/src/test/ui/parser/issues/issue-66357-unexpected-unreachable.stderr
diff --git a/src/test/ui/parser/issue-66473.rs b/src/test/ui/parser/issues/issue-66473.rs
index 9db4521bb42..9db4521bb42 100644
--- a/src/test/ui/parser/issue-66473.rs
+++ b/src/test/ui/parser/issues/issue-66473.rs
Binary files differdiff --git a/src/test/ui/parser/issue-66473.stderr b/src/test/ui/parser/issues/issue-66473.stderr
index 8a16d7f9551..8a16d7f9551 100644
--- a/src/test/ui/parser/issue-66473.stderr
+++ b/src/test/ui/parser/issues/issue-66473.stderr
Binary files differdiff --git a/src/test/ui/parser/issue-67146-negative-outlives-bound-syntactic-fail.fixed b/src/test/ui/parser/issues/issue-67146-negative-outlives-bound-syntactic-fail.fixed
index 95019b27869..95019b27869 100644
--- a/src/test/ui/parser/issue-67146-negative-outlives-bound-syntactic-fail.fixed
+++ b/src/test/ui/parser/issues/issue-67146-negative-outlives-bound-syntactic-fail.fixed
diff --git a/src/test/ui/parser/issue-67146-negative-outlives-bound-syntactic-fail.rs b/src/test/ui/parser/issues/issue-67146-negative-outlives-bound-syntactic-fail.rs
index 82f54f8faa9..82f54f8faa9 100644
--- a/src/test/ui/parser/issue-67146-negative-outlives-bound-syntactic-fail.rs
+++ b/src/test/ui/parser/issues/issue-67146-negative-outlives-bound-syntactic-fail.rs
diff --git a/src/test/ui/parser/issue-67146-negative-outlives-bound-syntactic-fail.stderr b/src/test/ui/parser/issues/issue-67146-negative-outlives-bound-syntactic-fail.stderr
index a4a422948ac..a4a422948ac 100644
--- a/src/test/ui/parser/issue-67146-negative-outlives-bound-syntactic-fail.stderr
+++ b/src/test/ui/parser/issues/issue-67146-negative-outlives-bound-syntactic-fail.stderr
diff --git a/src/test/ui/parser/issue-67377-invalid-syntax-in-enum-discriminant.rs b/src/test/ui/parser/issues/issue-67377-invalid-syntax-in-enum-discriminant.rs
index 87222ef4b59..87222ef4b59 100644
--- a/src/test/ui/parser/issue-67377-invalid-syntax-in-enum-discriminant.rs
+++ b/src/test/ui/parser/issues/issue-67377-invalid-syntax-in-enum-discriminant.rs
diff --git a/src/test/ui/parser/issue-67377-invalid-syntax-in-enum-discriminant.stderr b/src/test/ui/parser/issues/issue-67377-invalid-syntax-in-enum-discriminant.stderr
index 34f1397ce1d..34f1397ce1d 100644
--- a/src/test/ui/parser/issue-67377-invalid-syntax-in-enum-discriminant.stderr
+++ b/src/test/ui/parser/issues/issue-67377-invalid-syntax-in-enum-discriminant.stderr
diff --git a/src/test/ui/parser/issue-68000-unicode-ident-after-missing-comma.rs b/src/test/ui/parser/issues/issue-68000-unicode-ident-after-missing-comma.rs
index 3c49a5a9752..3c49a5a9752 100644
--- a/src/test/ui/parser/issue-68000-unicode-ident-after-missing-comma.rs
+++ b/src/test/ui/parser/issues/issue-68000-unicode-ident-after-missing-comma.rs
diff --git a/src/test/ui/parser/issue-68000-unicode-ident-after-missing-comma.stderr b/src/test/ui/parser/issues/issue-68000-unicode-ident-after-missing-comma.stderr
index ef365a61643..ef365a61643 100644
--- a/src/test/ui/parser/issue-68000-unicode-ident-after-missing-comma.stderr
+++ b/src/test/ui/parser/issues/issue-68000-unicode-ident-after-missing-comma.stderr
diff --git a/src/test/ui/parser/issue-68629.rs b/src/test/ui/parser/issues/issue-68629.rs
index 672a31f12c8..672a31f12c8 100644
--- a/src/test/ui/parser/issue-68629.rs
+++ b/src/test/ui/parser/issues/issue-68629.rs
Binary files differdiff --git a/src/test/ui/parser/issue-68629.stderr b/src/test/ui/parser/issues/issue-68629.stderr
index b2c7dddc801..b2c7dddc801 100644
--- a/src/test/ui/parser/issue-68629.stderr
+++ b/src/test/ui/parser/issues/issue-68629.stderr
Binary files differdiff --git a/src/test/ui/parser/issue-68730.rs b/src/test/ui/parser/issues/issue-68730.rs
index 20e18b4bcbb..20e18b4bcbb 100644
--- a/src/test/ui/parser/issue-68730.rs
+++ b/src/test/ui/parser/issues/issue-68730.rs
Binary files differdiff --git a/src/test/ui/parser/issue-68730.stderr b/src/test/ui/parser/issues/issue-68730.stderr
index 6585a19d954..6585a19d954 100644
--- a/src/test/ui/parser/issue-68730.stderr
+++ b/src/test/ui/parser/issues/issue-68730.stderr
Binary files differdiff --git a/src/test/ui/parser/issue-68788-in-trait-item-propagation.rs b/src/test/ui/parser/issues/issue-68788-in-trait-item-propagation.rs
index 7c3dd1d5a98..7c3dd1d5a98 100644
--- a/src/test/ui/parser/issue-68788-in-trait-item-propagation.rs
+++ b/src/test/ui/parser/issues/issue-68788-in-trait-item-propagation.rs
diff --git a/src/test/ui/parser/issue-68890-2.rs b/src/test/ui/parser/issues/issue-68890-2.rs
index 0a6e26acfc7..0a6e26acfc7 100644
--- a/src/test/ui/parser/issue-68890-2.rs
+++ b/src/test/ui/parser/issues/issue-68890-2.rs
diff --git a/src/test/ui/parser/issue-68890-2.stderr b/src/test/ui/parser/issues/issue-68890-2.stderr
index 1a64b9a017d..1a64b9a017d 100644
--- a/src/test/ui/parser/issue-68890-2.stderr
+++ b/src/test/ui/parser/issues/issue-68890-2.stderr
diff --git a/src/test/ui/parser/issue-68890.rs b/src/test/ui/parser/issues/issue-68890.rs
index bab4ed7f800..bab4ed7f800 100644
--- a/src/test/ui/parser/issue-68890.rs
+++ b/src/test/ui/parser/issues/issue-68890.rs
diff --git a/src/test/ui/parser/issue-68890.stderr b/src/test/ui/parser/issues/issue-68890.stderr
index 2a3bf6b41f0..2a3bf6b41f0 100644
--- a/src/test/ui/parser/issue-68890.stderr
+++ b/src/test/ui/parser/issues/issue-68890.stderr
diff --git a/src/test/ui/parser/issue-70050-ntliteral-accepts-negated-lit.rs b/src/test/ui/parser/issues/issue-70050-ntliteral-accepts-negated-lit.rs
index aca9d9eb0a5..aca9d9eb0a5 100644
--- a/src/test/ui/parser/issue-70050-ntliteral-accepts-negated-lit.rs
+++ b/src/test/ui/parser/issues/issue-70050-ntliteral-accepts-negated-lit.rs
diff --git a/src/test/ui/parser/issue-70388-recover-dotdotdot-rest-pat.rs b/src/test/ui/parser/issues/issue-70388-recover-dotdotdot-rest-pat.rs
index ca8abd78c47..ca8abd78c47 100644
--- a/src/test/ui/parser/issue-70388-recover-dotdotdot-rest-pat.rs
+++ b/src/test/ui/parser/issues/issue-70388-recover-dotdotdot-rest-pat.rs
diff --git a/src/test/ui/parser/issue-70388-recover-dotdotdot-rest-pat.stderr b/src/test/ui/parser/issues/issue-70388-recover-dotdotdot-rest-pat.stderr
index 4961e8fc049..4961e8fc049 100644
--- a/src/test/ui/parser/issue-70388-recover-dotdotdot-rest-pat.stderr
+++ b/src/test/ui/parser/issues/issue-70388-recover-dotdotdot-rest-pat.stderr
diff --git a/src/test/ui/parser/issue-70388-without-witness.fixed b/src/test/ui/parser/issues/issue-70388-without-witness.fixed
index 464e78fd035..464e78fd035 100644
--- a/src/test/ui/parser/issue-70388-without-witness.fixed
+++ b/src/test/ui/parser/issues/issue-70388-without-witness.fixed
diff --git a/src/test/ui/parser/issue-70388-without-witness.rs b/src/test/ui/parser/issues/issue-70388-without-witness.rs
index 9e35e4c38aa..9e35e4c38aa 100644
--- a/src/test/ui/parser/issue-70388-without-witness.rs
+++ b/src/test/ui/parser/issues/issue-70388-without-witness.rs
diff --git a/src/test/ui/parser/issue-70388-without-witness.stderr b/src/test/ui/parser/issues/issue-70388-without-witness.stderr
index b750ad4c626..b750ad4c626 100644
--- a/src/test/ui/parser/issue-70388-without-witness.stderr
+++ b/src/test/ui/parser/issues/issue-70388-without-witness.stderr
diff --git a/src/test/ui/parser/issue-70549-resolve-after-recovered-self-ctor.rs b/src/test/ui/parser/issues/issue-70549-resolve-after-recovered-self-ctor.rs
index aeccd0d9f76..aeccd0d9f76 100644
--- a/src/test/ui/parser/issue-70549-resolve-after-recovered-self-ctor.rs
+++ b/src/test/ui/parser/issues/issue-70549-resolve-after-recovered-self-ctor.rs
diff --git a/src/test/ui/parser/issue-70549-resolve-after-recovered-self-ctor.stderr b/src/test/ui/parser/issues/issue-70549-resolve-after-recovered-self-ctor.stderr
index 421f1454036..421f1454036 100644
--- a/src/test/ui/parser/issue-70549-resolve-after-recovered-self-ctor.stderr
+++ b/src/test/ui/parser/issues/issue-70549-resolve-after-recovered-self-ctor.stderr
diff --git a/src/test/ui/parser/issue-70552-ascription-in-parens-after-call.rs b/src/test/ui/parser/issues/issue-70552-ascription-in-parens-after-call.rs
index 9b6dd7db4be..9b6dd7db4be 100644
--- a/src/test/ui/parser/issue-70552-ascription-in-parens-after-call.rs
+++ b/src/test/ui/parser/issues/issue-70552-ascription-in-parens-after-call.rs
diff --git a/src/test/ui/parser/issue-70552-ascription-in-parens-after-call.stderr b/src/test/ui/parser/issues/issue-70552-ascription-in-parens-after-call.stderr
index f03c92e1b1f..f03c92e1b1f 100644
--- a/src/test/ui/parser/issue-70552-ascription-in-parens-after-call.stderr
+++ b/src/test/ui/parser/issues/issue-70552-ascription-in-parens-after-call.stderr
diff --git a/src/test/ui/parser/issue-70583-block-is-empty-1.rs b/src/test/ui/parser/issues/issue-70583-block-is-empty-1.rs
index f560f68f613..f560f68f613 100644
--- a/src/test/ui/parser/issue-70583-block-is-empty-1.rs
+++ b/src/test/ui/parser/issues/issue-70583-block-is-empty-1.rs
diff --git a/src/test/ui/parser/issue-70583-block-is-empty-1.stderr b/src/test/ui/parser/issues/issue-70583-block-is-empty-1.stderr
index 39bf113ef83..39bf113ef83 100644
--- a/src/test/ui/parser/issue-70583-block-is-empty-1.stderr
+++ b/src/test/ui/parser/issues/issue-70583-block-is-empty-1.stderr
diff --git a/src/test/ui/parser/issue-70583-block-is-empty-2.rs b/src/test/ui/parser/issues/issue-70583-block-is-empty-2.rs
index 80f53338a68..80f53338a68 100644
--- a/src/test/ui/parser/issue-70583-block-is-empty-2.rs
+++ b/src/test/ui/parser/issues/issue-70583-block-is-empty-2.rs
diff --git a/src/test/ui/parser/issue-70583-block-is-empty-2.stderr b/src/test/ui/parser/issues/issue-70583-block-is-empty-2.stderr
index 5d37b216427..5d37b216427 100644
--- a/src/test/ui/parser/issue-70583-block-is-empty-2.stderr
+++ b/src/test/ui/parser/issues/issue-70583-block-is-empty-2.stderr
diff --git a/src/test/ui/parser/issue-7222.rs b/src/test/ui/parser/issues/issue-7222.rs
index 64907316626..64907316626 100644
--- a/src/test/ui/parser/issue-7222.rs
+++ b/src/test/ui/parser/issues/issue-7222.rs
diff --git a/src/test/ui/parser/issue-72253.rs b/src/test/ui/parser/issues/issue-72253.rs
index 1446a796fa0..1446a796fa0 100644
--- a/src/test/ui/parser/issue-72253.rs
+++ b/src/test/ui/parser/issues/issue-72253.rs
diff --git a/src/test/ui/parser/issue-72253.stderr b/src/test/ui/parser/issues/issue-72253.stderr
index 477fa09f495..477fa09f495 100644
--- a/src/test/ui/parser/issue-72253.stderr
+++ b/src/test/ui/parser/issues/issue-72253.stderr
diff --git a/src/test/ui/parser/issue-72373.rs b/src/test/ui/parser/issues/issue-72373.rs
index 4da6061c27f..4da6061c27f 100644
--- a/src/test/ui/parser/issue-72373.rs
+++ b/src/test/ui/parser/issues/issue-72373.rs
diff --git a/src/test/ui/parser/issue-72373.stderr b/src/test/ui/parser/issues/issue-72373.stderr
index 0bb99a01e55..0bb99a01e55 100644
--- a/src/test/ui/parser/issue-72373.stderr
+++ b/src/test/ui/parser/issues/issue-72373.stderr
diff --git a/src/test/ui/parser/issue-73568-lifetime-after-mut.rs b/src/test/ui/parser/issues/issue-73568-lifetime-after-mut.rs
index e68ee747cfd..e68ee747cfd 100644
--- a/src/test/ui/parser/issue-73568-lifetime-after-mut.rs
+++ b/src/test/ui/parser/issues/issue-73568-lifetime-after-mut.rs
diff --git a/src/test/ui/parser/issue-73568-lifetime-after-mut.stderr b/src/test/ui/parser/issues/issue-73568-lifetime-after-mut.stderr
index 48c2b2a19d4..48c2b2a19d4 100644
--- a/src/test/ui/parser/issue-73568-lifetime-after-mut.stderr
+++ b/src/test/ui/parser/issues/issue-73568-lifetime-after-mut.stderr
diff --git a/src/test/ui/parser/issue-75599.rs b/src/test/ui/parser/issues/issue-75599.rs
index 0857676e4ed..0857676e4ed 100644
--- a/src/test/ui/parser/issue-75599.rs
+++ b/src/test/ui/parser/issues/issue-75599.rs
diff --git a/src/test/ui/parser/issue-76437-async.rs b/src/test/ui/parser/issues/issue-76437-async.rs
index 84ee3dd2112..84ee3dd2112 100644
--- a/src/test/ui/parser/issue-76437-async.rs
+++ b/src/test/ui/parser/issues/issue-76437-async.rs
diff --git a/src/test/ui/parser/issue-76437-async.stderr b/src/test/ui/parser/issues/issue-76437-async.stderr
index 2c9c2a8cfba..2c9c2a8cfba 100644
--- a/src/test/ui/parser/issue-76437-async.stderr
+++ b/src/test/ui/parser/issues/issue-76437-async.stderr
diff --git a/src/test/ui/parser/issue-76437-const-async-unsafe.rs b/src/test/ui/parser/issues/issue-76437-const-async-unsafe.rs
index f1e06e4ad89..f1e06e4ad89 100644
--- a/src/test/ui/parser/issue-76437-const-async-unsafe.rs
+++ b/src/test/ui/parser/issues/issue-76437-const-async-unsafe.rs
diff --git a/src/test/ui/parser/issue-76437-const-async-unsafe.stderr b/src/test/ui/parser/issues/issue-76437-const-async-unsafe.stderr
index 2e91beda116..2e91beda116 100644
--- a/src/test/ui/parser/issue-76437-const-async-unsafe.stderr
+++ b/src/test/ui/parser/issues/issue-76437-const-async-unsafe.stderr
diff --git a/src/test/ui/parser/issue-76437-const-async.rs b/src/test/ui/parser/issues/issue-76437-const-async.rs
index 3c789fdcd02..3c789fdcd02 100644
--- a/src/test/ui/parser/issue-76437-const-async.rs
+++ b/src/test/ui/parser/issues/issue-76437-const-async.rs
diff --git a/src/test/ui/parser/issue-76437-const-async.stderr b/src/test/ui/parser/issues/issue-76437-const-async.stderr
index 21b96c14d7d..21b96c14d7d 100644
--- a/src/test/ui/parser/issue-76437-const-async.stderr
+++ b/src/test/ui/parser/issues/issue-76437-const-async.stderr
diff --git a/src/test/ui/parser/issue-76437-const.rs b/src/test/ui/parser/issues/issue-76437-const.rs
index d3815a52346..d3815a52346 100644
--- a/src/test/ui/parser/issue-76437-const.rs
+++ b/src/test/ui/parser/issues/issue-76437-const.rs
diff --git a/src/test/ui/parser/issue-76437-const.stderr b/src/test/ui/parser/issues/issue-76437-const.stderr
index cf80d9a9037..cf80d9a9037 100644
--- a/src/test/ui/parser/issue-76437-const.stderr
+++ b/src/test/ui/parser/issues/issue-76437-const.stderr
diff --git a/src/test/ui/parser/issue-76437-pub-crate-unsafe.rs b/src/test/ui/parser/issues/issue-76437-pub-crate-unsafe.rs
index daa1d120795..daa1d120795 100644
--- a/src/test/ui/parser/issue-76437-pub-crate-unsafe.rs
+++ b/src/test/ui/parser/issues/issue-76437-pub-crate-unsafe.rs
diff --git a/src/test/ui/parser/issue-76437-pub-crate-unsafe.stderr b/src/test/ui/parser/issues/issue-76437-pub-crate-unsafe.stderr
index fa8f13721c8..fa8f13721c8 100644
--- a/src/test/ui/parser/issue-76437-pub-crate-unsafe.stderr
+++ b/src/test/ui/parser/issues/issue-76437-pub-crate-unsafe.stderr
diff --git a/src/test/ui/parser/issue-76437-unsafe.rs b/src/test/ui/parser/issues/issue-76437-unsafe.rs
index 785a79a79a2..785a79a79a2 100644
--- a/src/test/ui/parser/issue-76437-unsafe.rs
+++ b/src/test/ui/parser/issues/issue-76437-unsafe.rs
diff --git a/src/test/ui/parser/issue-76437-unsafe.stderr b/src/test/ui/parser/issues/issue-76437-unsafe.stderr
index c63292ef853..c63292ef853 100644
--- a/src/test/ui/parser/issue-76437-unsafe.stderr
+++ b/src/test/ui/parser/issues/issue-76437-unsafe.stderr
diff --git a/src/test/ui/parser/issue-76597.fixed b/src/test/ui/parser/issues/issue-76597.fixed
index 2d7a30b8361..2d7a30b8361 100644
--- a/src/test/ui/parser/issue-76597.fixed
+++ b/src/test/ui/parser/issues/issue-76597.fixed
diff --git a/src/test/ui/parser/issue-76597.rs b/src/test/ui/parser/issues/issue-76597.rs
index 521b9c64b1c..521b9c64b1c 100644
--- a/src/test/ui/parser/issue-76597.rs
+++ b/src/test/ui/parser/issues/issue-76597.rs
diff --git a/src/test/ui/parser/issue-76597.stderr b/src/test/ui/parser/issues/issue-76597.stderr
index 50b23329f0c..50b23329f0c 100644
--- a/src/test/ui/parser/issue-76597.stderr
+++ b/src/test/ui/parser/issues/issue-76597.stderr
diff --git a/src/test/ui/parser/issue-7970b.rs b/src/test/ui/parser/issues/issue-7970b.rs
index 1c4abce3959..1c4abce3959 100644
--- a/src/test/ui/parser/issue-7970b.rs
+++ b/src/test/ui/parser/issues/issue-7970b.rs
diff --git a/src/test/ui/parser/issue-7970b.stderr b/src/test/ui/parser/issues/issue-7970b.stderr
index a62226a8a4d..a62226a8a4d 100644
--- a/src/test/ui/parser/issue-7970b.stderr
+++ b/src/test/ui/parser/issues/issue-7970b.stderr
diff --git a/src/test/ui/parser/issue-81806.rs b/src/test/ui/parser/issues/issue-81806.rs
index ca86788dff7..ca86788dff7 100644
--- a/src/test/ui/parser/issue-81806.rs
+++ b/src/test/ui/parser/issues/issue-81806.rs
diff --git a/src/test/ui/parser/issue-81806.stderr b/src/test/ui/parser/issues/issue-81806.stderr
index a62c9b0a1aa..a62c9b0a1aa 100644
--- a/src/test/ui/parser/issue-81806.stderr
+++ b/src/test/ui/parser/issues/issue-81806.stderr
diff --git a/src/test/ui/parser/issue-83639.rs b/src/test/ui/parser/issues/issue-83639.rs
index 6ddbedfa0bc..6ddbedfa0bc 100644
--- a/src/test/ui/parser/issue-83639.rs
+++ b/src/test/ui/parser/issues/issue-83639.rs
diff --git a/src/test/ui/parser/issue-83639.stderr b/src/test/ui/parser/issues/issue-83639.stderr
index 4c10df1917c..4c10df1917c 100644
--- a/src/test/ui/parser/issue-83639.stderr
+++ b/src/test/ui/parser/issues/issue-83639.stderr
diff --git a/src/test/ui/parser/issue-84104.rs b/src/test/ui/parser/issues/issue-84104.rs
index 998949b94a4..998949b94a4 100644
--- a/src/test/ui/parser/issue-84104.rs
+++ b/src/test/ui/parser/issues/issue-84104.rs
diff --git a/src/test/ui/parser/issue-84104.stderr b/src/test/ui/parser/issues/issue-84104.stderr
index aff31f2c971..aff31f2c971 100644
--- a/src/test/ui/parser/issue-84104.stderr
+++ b/src/test/ui/parser/issues/issue-84104.stderr
diff --git a/src/test/ui/parser/issue-84117.rs b/src/test/ui/parser/issues/issue-84117.rs
index 919585877cf..919585877cf 100644
--- a/src/test/ui/parser/issue-84117.rs
+++ b/src/test/ui/parser/issues/issue-84117.rs
diff --git a/src/test/ui/parser/issue-84117.stderr b/src/test/ui/parser/issues/issue-84117.stderr
index 5b9cc53baa5..5b9cc53baa5 100644
--- a/src/test/ui/parser/issue-84117.stderr
+++ b/src/test/ui/parser/issues/issue-84117.stderr
diff --git a/src/test/ui/parser/issue-84148-1.rs b/src/test/ui/parser/issues/issue-84148-1.rs
index 25f7ba4d1f8..25f7ba4d1f8 100644
--- a/src/test/ui/parser/issue-84148-1.rs
+++ b/src/test/ui/parser/issues/issue-84148-1.rs
diff --git a/src/test/ui/parser/issue-84148-1.stderr b/src/test/ui/parser/issues/issue-84148-1.stderr
index 98506568d82..98506568d82 100644
--- a/src/test/ui/parser/issue-84148-1.stderr
+++ b/src/test/ui/parser/issues/issue-84148-1.stderr
diff --git a/src/test/ui/parser/issue-84148-2.rs b/src/test/ui/parser/issues/issue-84148-2.rs
index 257a3fd6720..257a3fd6720 100644
--- a/src/test/ui/parser/issue-84148-2.rs
+++ b/src/test/ui/parser/issues/issue-84148-2.rs
diff --git a/src/test/ui/parser/issue-84148-2.stderr b/src/test/ui/parser/issues/issue-84148-2.stderr
index 6f314da4360..6f314da4360 100644
--- a/src/test/ui/parser/issue-84148-2.stderr
+++ b/src/test/ui/parser/issues/issue-84148-2.stderr
diff --git a/src/test/ui/parser/issue-8537.rs b/src/test/ui/parser/issues/issue-8537.rs
index 9d0cbce6c8a..9d0cbce6c8a 100644
--- a/src/test/ui/parser/issue-8537.rs
+++ b/src/test/ui/parser/issues/issue-8537.rs
diff --git a/src/test/ui/parser/issue-8537.stderr b/src/test/ui/parser/issues/issue-8537.stderr
index 5a29ce2221f..5a29ce2221f 100644
--- a/src/test/ui/parser/issue-8537.stderr
+++ b/src/test/ui/parser/issues/issue-8537.stderr
diff --git a/src/test/ui/parser/issue-86895.rs b/src/test/ui/parser/issues/issue-86895.rs
index 4cd09843107..4cd09843107 100644
--- a/src/test/ui/parser/issue-86895.rs
+++ b/src/test/ui/parser/issues/issue-86895.rs
diff --git a/src/test/ui/parser/issue-86895.stderr b/src/test/ui/parser/issues/issue-86895.stderr
index 575d857c0ed..575d857c0ed 100644
--- a/src/test/ui/parser/issue-86895.stderr
+++ b/src/test/ui/parser/issues/issue-86895.stderr
diff --git a/src/test/ui/parser/issue-87086-colon-path-sep.rs b/src/test/ui/parser/issues/issue-87086-colon-path-sep.rs
index 4ee0b2054ff..4ee0b2054ff 100644
--- a/src/test/ui/parser/issue-87086-colon-path-sep.rs
+++ b/src/test/ui/parser/issues/issue-87086-colon-path-sep.rs
diff --git a/src/test/ui/parser/issue-87086-colon-path-sep.stderr b/src/test/ui/parser/issues/issue-87086-colon-path-sep.stderr
index 8f93661a626..8f93661a626 100644
--- a/src/test/ui/parser/issue-87086-colon-path-sep.stderr
+++ b/src/test/ui/parser/issues/issue-87086-colon-path-sep.stderr
diff --git a/src/test/ui/parser/issue-87197-missing-semicolon.fixed b/src/test/ui/parser/issues/issue-87197-missing-semicolon.fixed
index 53f071db781..53f071db781 100644
--- a/src/test/ui/parser/issue-87197-missing-semicolon.fixed
+++ b/src/test/ui/parser/issues/issue-87197-missing-semicolon.fixed
diff --git a/src/test/ui/parser/issue-87197-missing-semicolon.rs b/src/test/ui/parser/issues/issue-87197-missing-semicolon.rs
index db0edf4529c..db0edf4529c 100644
--- a/src/test/ui/parser/issue-87197-missing-semicolon.rs
+++ b/src/test/ui/parser/issues/issue-87197-missing-semicolon.rs
diff --git a/src/test/ui/parser/issue-87197-missing-semicolon.stderr b/src/test/ui/parser/issues/issue-87197-missing-semicolon.stderr
index 57772de1e7a..57772de1e7a 100644
--- a/src/test/ui/parser/issue-87197-missing-semicolon.stderr
+++ b/src/test/ui/parser/issues/issue-87197-missing-semicolon.stderr
diff --git a/src/test/ui/parser/issue-87217-keyword-order/const-async-const.rs b/src/test/ui/parser/issues/issue-87217-keyword-order/const-async-const.rs
index 7c3d915a4c0..7c3d915a4c0 100644
--- a/src/test/ui/parser/issue-87217-keyword-order/const-async-const.rs
+++ b/src/test/ui/parser/issues/issue-87217-keyword-order/const-async-const.rs
diff --git a/src/test/ui/parser/issue-87217-keyword-order/const-async-const.stderr b/src/test/ui/parser/issues/issue-87217-keyword-order/const-async-const.stderr
index 56280912540..56280912540 100644
--- a/src/test/ui/parser/issue-87217-keyword-order/const-async-const.stderr
+++ b/src/test/ui/parser/issues/issue-87217-keyword-order/const-async-const.stderr
diff --git a/src/test/ui/parser/issue-87217-keyword-order/several-kw-jump.rs b/src/test/ui/parser/issues/issue-87217-keyword-order/several-kw-jump.rs
index 86fdb78cce8..86fdb78cce8 100644
--- a/src/test/ui/parser/issue-87217-keyword-order/several-kw-jump.rs
+++ b/src/test/ui/parser/issues/issue-87217-keyword-order/several-kw-jump.rs
diff --git a/src/test/ui/parser/issue-87217-keyword-order/several-kw-jump.stderr b/src/test/ui/parser/issues/issue-87217-keyword-order/several-kw-jump.stderr
index 65cce77be89..65cce77be89 100644
--- a/src/test/ui/parser/issue-87217-keyword-order/several-kw-jump.stderr
+++ b/src/test/ui/parser/issues/issue-87217-keyword-order/several-kw-jump.stderr
diff --git a/src/test/ui/parser/issue-87217-keyword-order/wrong-async.rs b/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-async.rs
index edfb330d671..edfb330d671 100644
--- a/src/test/ui/parser/issue-87217-keyword-order/wrong-async.rs
+++ b/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-async.rs
diff --git a/src/test/ui/parser/issue-87217-keyword-order/wrong-async.stderr b/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-async.stderr
index 3acd9e44004..3acd9e44004 100644
--- a/src/test/ui/parser/issue-87217-keyword-order/wrong-async.stderr
+++ b/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-async.stderr
diff --git a/src/test/ui/parser/issue-87217-keyword-order/wrong-const.rs b/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-const.rs
index abd692b80d5..abd692b80d5 100644
--- a/src/test/ui/parser/issue-87217-keyword-order/wrong-const.rs
+++ b/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-const.rs
diff --git a/src/test/ui/parser/issue-87217-keyword-order/wrong-const.stderr b/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-const.stderr
index 9a3e07b1e87..9a3e07b1e87 100644
--- a/src/test/ui/parser/issue-87217-keyword-order/wrong-const.stderr
+++ b/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-const.stderr
diff --git a/src/test/ui/parser/issue-87217-keyword-order/wrong-unsafe.rs b/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.rs
index 7f0761e9938..7f0761e9938 100644
--- a/src/test/ui/parser/issue-87217-keyword-order/wrong-unsafe.rs
+++ b/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.rs
diff --git a/src/test/ui/parser/issue-87217-keyword-order/wrong-unsafe.stderr b/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.stderr
index 395ee9fedbc..395ee9fedbc 100644
--- a/src/test/ui/parser/issue-87217-keyword-order/wrong-unsafe.stderr
+++ b/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.stderr
diff --git a/src/test/ui/parser/issue-87635.rs b/src/test/ui/parser/issues/issue-87635.rs
index da74c1877b1..da74c1877b1 100644
--- a/src/test/ui/parser/issue-87635.rs
+++ b/src/test/ui/parser/issues/issue-87635.rs
diff --git a/src/test/ui/parser/issue-87635.stderr b/src/test/ui/parser/issues/issue-87635.stderr
index 920a9f937dd..920a9f937dd 100644
--- a/src/test/ui/parser/issue-87635.stderr
+++ b/src/test/ui/parser/issues/issue-87635.stderr
diff --git a/src/test/ui/parser/issue-87812-path.rs b/src/test/ui/parser/issues/issue-87812-path.rs
index b88780876db..b88780876db 100644
--- a/src/test/ui/parser/issue-87812-path.rs
+++ b/src/test/ui/parser/issues/issue-87812-path.rs
diff --git a/src/test/ui/parser/issue-87812-path.stderr b/src/test/ui/parser/issues/issue-87812-path.stderr
index f8ee0517533..f8ee0517533 100644
--- a/src/test/ui/parser/issue-87812-path.stderr
+++ b/src/test/ui/parser/issues/issue-87812-path.stderr
diff --git a/src/test/ui/parser/issue-87812.rs b/src/test/ui/parser/issues/issue-87812.rs
index 0ba87b99544..0ba87b99544 100644
--- a/src/test/ui/parser/issue-87812.rs
+++ b/src/test/ui/parser/issues/issue-87812.rs
diff --git a/src/test/ui/parser/issue-87812.stderr b/src/test/ui/parser/issues/issue-87812.stderr
index d61ee23a50b..d61ee23a50b 100644
--- a/src/test/ui/parser/issue-87812.stderr
+++ b/src/test/ui/parser/issues/issue-87812.stderr
diff --git a/src/test/ui/parser/issue-88276-unary-plus.fixed b/src/test/ui/parser/issues/issue-88276-unary-plus.fixed
index 25b7c340f60..25b7c340f60 100644
--- a/src/test/ui/parser/issue-88276-unary-plus.fixed
+++ b/src/test/ui/parser/issues/issue-88276-unary-plus.fixed
diff --git a/src/test/ui/parser/issue-88276-unary-plus.rs b/src/test/ui/parser/issues/issue-88276-unary-plus.rs
index 11b2e9d6016..11b2e9d6016 100644
--- a/src/test/ui/parser/issue-88276-unary-plus.rs
+++ b/src/test/ui/parser/issues/issue-88276-unary-plus.rs
diff --git a/src/test/ui/parser/issue-88276-unary-plus.stderr b/src/test/ui/parser/issues/issue-88276-unary-plus.stderr
index b26761729a8..b26761729a8 100644
--- a/src/test/ui/parser/issue-88276-unary-plus.stderr
+++ b/src/test/ui/parser/issues/issue-88276-unary-plus.stderr
diff --git a/src/test/ui/parser/issue-88583-union-as-ident.rs b/src/test/ui/parser/issues/issue-88583-union-as-ident.rs
index b3d66d46b1d..b3d66d46b1d 100644
--- a/src/test/ui/parser/issue-88583-union-as-ident.rs
+++ b/src/test/ui/parser/issues/issue-88583-union-as-ident.rs
diff --git a/src/test/ui/parser/issue-88770.rs b/src/test/ui/parser/issues/issue-88770.rs
index bf89033f560..bf89033f560 100644
--- a/src/test/ui/parser/issue-88770.rs
+++ b/src/test/ui/parser/issues/issue-88770.rs
diff --git a/src/test/ui/parser/issue-88770.stderr b/src/test/ui/parser/issues/issue-88770.stderr
index c7e24155d16..c7e24155d16 100644
--- a/src/test/ui/parser/issue-88770.stderr
+++ b/src/test/ui/parser/issues/issue-88770.stderr
diff --git a/src/test/ui/parser/issue-88818.rs b/src/test/ui/parser/issues/issue-88818.rs
index b9233ca8339..b9233ca8339 100644
--- a/src/test/ui/parser/issue-88818.rs
+++ b/src/test/ui/parser/issues/issue-88818.rs
diff --git a/src/test/ui/parser/issue-88818.stderr b/src/test/ui/parser/issues/issue-88818.stderr
index d30990ae582..d30990ae582 100644
--- a/src/test/ui/parser/issue-88818.stderr
+++ b/src/test/ui/parser/issues/issue-88818.stderr
diff --git a/src/test/ui/parser/issue-89388.rs b/src/test/ui/parser/issues/issue-89388.rs
index 9153c071e8e..9153c071e8e 100644
--- a/src/test/ui/parser/issue-89388.rs
+++ b/src/test/ui/parser/issues/issue-89388.rs
diff --git a/src/test/ui/parser/issue-89388.stderr b/src/test/ui/parser/issues/issue-89388.stderr
index cf28bef0f4a..cf28bef0f4a 100644
--- a/src/test/ui/parser/issue-89388.stderr
+++ b/src/test/ui/parser/issues/issue-89388.stderr
diff --git a/src/test/ui/parser/issue-89396.fixed b/src/test/ui/parser/issues/issue-89396.fixed
index 823ad8cd1f8..823ad8cd1f8 100644
--- a/src/test/ui/parser/issue-89396.fixed
+++ b/src/test/ui/parser/issues/issue-89396.fixed
diff --git a/src/test/ui/parser/issue-89396.rs b/src/test/ui/parser/issues/issue-89396.rs
index f1d9efa524f..f1d9efa524f 100644
--- a/src/test/ui/parser/issue-89396.rs
+++ b/src/test/ui/parser/issues/issue-89396.rs
diff --git a/src/test/ui/parser/issue-89396.stderr b/src/test/ui/parser/issues/issue-89396.stderr
index 504420574e2..504420574e2 100644
--- a/src/test/ui/parser/issue-89396.stderr
+++ b/src/test/ui/parser/issues/issue-89396.stderr
diff --git a/src/test/ui/parser/issue-89574.rs b/src/test/ui/parser/issues/issue-89574.rs
index 0a477f1aa5f..0a477f1aa5f 100644
--- a/src/test/ui/parser/issue-89574.rs
+++ b/src/test/ui/parser/issues/issue-89574.rs
diff --git a/src/test/ui/parser/issue-89574.stderr b/src/test/ui/parser/issues/issue-89574.stderr
index cbee3d35155..cbee3d35155 100644
--- a/src/test/ui/parser/issue-89574.stderr
+++ b/src/test/ui/parser/issues/issue-89574.stderr
diff --git a/src/test/ui/parser/issue-89971-outer-attr-following-inner-attr-ice.rs b/src/test/ui/parser/issues/issue-89971-outer-attr-following-inner-attr-ice.rs
index fe67d9822fc..fe67d9822fc 100644
--- a/src/test/ui/parser/issue-89971-outer-attr-following-inner-attr-ice.rs
+++ b/src/test/ui/parser/issues/issue-89971-outer-attr-following-inner-attr-ice.rs
diff --git a/src/test/ui/parser/issue-89971-outer-attr-following-inner-attr-ice.stderr b/src/test/ui/parser/issues/issue-89971-outer-attr-following-inner-attr-ice.stderr
index 34a6ab00d7b..34a6ab00d7b 100644
--- a/src/test/ui/parser/issue-89971-outer-attr-following-inner-attr-ice.stderr
+++ b/src/test/ui/parser/issues/issue-89971-outer-attr-following-inner-attr-ice.stderr
diff --git a/src/test/ui/parser/issues/issue-90993.rs b/src/test/ui/parser/issues/issue-90993.rs
new file mode 100644
index 00000000000..40e6fc74876
--- /dev/null
+++ b/src/test/ui/parser/issues/issue-90993.rs
@@ -0,0 +1,6 @@
+fn main() {
+    ...=.
+    //~^ ERROR: unexpected token: `...`
+    //~| ERROR: unexpected `=` after inclusive range
+    //~| ERROR: expected one of `-`, `;`, `}`, or path, found `.`
+}
diff --git a/src/test/ui/parser/issues/issue-90993.stderr b/src/test/ui/parser/issues/issue-90993.stderr
new file mode 100644
index 00000000000..ab6bce410e6
--- /dev/null
+++ b/src/test/ui/parser/issues/issue-90993.stderr
@@ -0,0 +1,31 @@
+error: unexpected token: `...`
+  --> $DIR/issue-90993.rs:2:5
+   |
+LL |     ...=.
+   |     ^^^
+   |
+help: use `..` for an exclusive range
+   |
+LL |     ..=.
+   |     ~~
+help: or `..=` for an inclusive range
+   |
+LL |     ..==.
+   |     ~~~
+
+error: unexpected `=` after inclusive range
+  --> $DIR/issue-90993.rs:2:5
+   |
+LL |     ...=.
+   |     ^^^^ help: use `..=` instead
+   |
+   = note: inclusive ranges end with a single equals sign (`..=`)
+
+error: expected one of `-`, `;`, `}`, or path, found `.`
+  --> $DIR/issue-90993.rs:2:9
+   |
+LL |     ...=.
+   |         ^ expected one of `-`, `;`, `}`, or path
+
+error: aborting due to 3 previous errors
+
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index 248d4f1583f..7fae9bf0f69 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -9,7 +9,7 @@ const ENTRY_LIMIT: usize = 1000;
 // FIXME: The following limits should be reduced eventually.
 const ROOT_ENTRY_LIMIT: usize = 983;
 const ISSUES_ENTRY_LIMIT: usize = 2310;
-const PARSER_LIMIT: usize = 1010;
+const PARSER_LIMIT: usize = 1012;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     let dirs = walkdir::WalkDir::new(&path.join("test/ui"))
author	bors <bors@rust-lang.org>	2021-11-20 21:40:43 +0000
committer	bors <bors@rust-lang.org>	2021-11-20 21:40:43 +0000
commit	5bc98076f37dd8c1476de4bbe0515c55a65332b7 (patch)
tree	72069a573411275125b5cf4ebe6230ffefe7c5ac
parent	2885c474823637ae69c5967327327a337aebedb2 (diff)
parent	83c83d4dd7eb92e2f65a336f36a46cbc087570ea (diff)
download	rust-5bc98076f37dd8c1476de4bbe0515c55a65332b7.tar.gz rust-5bc98076f37dd8c1476de4bbe0515c55a65332b7.zip