formatting

Author: gabrielbusta

compiler/rustc_trait_selection/src/errors.rs

@@ -35,15 +35,15 @@ pub struct AutoDerefReachedRecursionLimit {
 pub struct EmptyOnClauseInOnUnimplemented {
     #[primary_span]
     #[label(trait_selection::empty_on_clause_in_rustc_on_unimplemented_label)]
-    pub span: Span
+    pub span: Span,
 }
 
 #[derive(SessionDiagnostic)]
 #[error(trait_selection::invalid_on_clause_in_rustc_on_unimplemented, code = "E0232")]
 pub struct InvalidOnClauseInOnUnimplemented {
     #[primary_span]
     #[label(trait_selection::invalid_on_clause_in_rustc_on_unimplemented_label)]
-    pub span: Span
+    pub span: Span,
 }
 
 #[derive(SessionDiagnostic)]
@@ -52,5 +52,5 @@ pub struct NoValueInOnUnimplemented {
     #[primary_span]
     #[label(trait_selection::no_value_in_rustc_on_unimplemented_label)]
     #[note(trait_selection::no_value_in_rustc_on_unimplemented_note)]
-    pub span: Span
+    pub span: Span,
 }

compiler/rustc_trait_selection/src/traits/auto_trait.rs

@@ -831,12 +831,11 @@ impl<'tcx> AutoTraitFinder<'tcx> {
                                 Ok(None) => {
                                     let tcx = self.tcx;
                                     let def_id = unevaluated.def.did;
-                                    let reported = tcx.sess.emit_err(
-                                        UnableToConstructConstantValue {
+                                    let reported =
+                                        tcx.sess.emit_err(UnableToConstructConstantValue {
                                             span: tcx.def_span(def_id),
                                             unevaluated: format!("{:?}", unevaluated),
-                                        },
-                                    );
+                                        });
                                     Err(ErrorHandled::Reported(reported))
                                 }
                                 Err(err) => Err(err),

compiler/rustc_trait_selection/src/traits/on_unimplemented.rs

@@ -8,7 +8,9 @@ use rustc_parse_format::{ParseMode, Parser, Piece, Position};
 use rustc_span::symbol::{kw, sym, Symbol};
 use rustc_span::{Span, DUMMY_SP};
 
-use crate::errors::{EmptyOnClauseInOnUnimplemented, InvalidOnClauseInOnUnimplemented, NoValueInOnUnimplemented};
+use crate::errors::{
+    EmptyOnClauseInOnUnimplemented, InvalidOnClauseInOnUnimplemented, NoValueInOnUnimplemented,
+};
 
 #[derive(Clone, Debug)]
 pub struct OnUnimplementedFormatString(Symbol);
@@ -57,17 +59,9 @@ impl<'tcx> OnUnimplementedDirective {
         } else {
             let cond = item_iter
                 .next()
-                .ok_or_else(|| {
-                    tcx.sess.emit_err(EmptyOnClauseInOnUnimplemented {
-                        span
-                    })
-                })?
+                .ok_or_else(|| tcx.sess.emit_err(EmptyOnClauseInOnUnimplemented { span }))?
                 .meta_item()
-                .ok_or_else(|| {
-                    tcx.sess.emit_err(InvalidOnClauseInOnUnimplemented {
-                        span
-                    })
-                })?;
+                .ok_or_else(|| tcx.sess.emit_err(InvalidOnClauseInOnUnimplemented { span }))?;
             attr::eval_condition(cond, &tcx.sess.parse_sess, Some(tcx.features()), &mut |cfg| {
                 if let Some(value) = cfg.value && let Err(guar) = parse_value(value) {
                     errored = Some(guar);
@@ -129,11 +123,7 @@ impl<'tcx> OnUnimplementedDirective {
             }
 
             // nothing found
-            tcx.sess.emit_err(
-                NoValueInOnUnimplemented {
-                    span: item.span(),
-                }
-            );
+            tcx.sess.emit_err(NoValueInOnUnimplemented { span: item.span() });
         }
 
         if let Some(reported) = errored {