Fix style according to review comments.

Author: vi

src/librustc/session/mod.rs

@@ -432,8 +432,12 @@ impl Session {
                 }
                 DiagnosticBuilderMethod::SpanSuggestion(suggestion) => {
                     let span = span_maybe.expect("span_suggestion_* needs a span");
-                    diag_builder.span_suggestion_with_applicability(span, message, suggestion,
-                                                                    Applicability::Unspecified);
+                    diag_builder.span_suggestion_with_applicability(
+                                                                    span,
+                                                                    message,
+                                                                    suggestion,
+                                                                    Applicability::Unspecified,
+                                                                    );
                 }
             }
         }

src/librustc_borrowck/borrowck/mod.rs

@@ -868,11 +868,19 @@ impl<'a, 'tcx> BorrowckCtxt<'a, 'tcx> {
                                             db.note(fn_closure_msg);
                                         } else {
                                             db.span_suggestion_with_applicability(
-                                                sp, msg, suggestion, Applicability::Unspecified);
+                                                                                  sp,
+                                                                                  msg,
+                                                                                  suggestion,
+                                                                                  Applicability::Unspecified,
+                                                                                  );
                                         }
                                     } else {
                                         db.span_suggestion_with_applicability(
-                                                sp, msg, suggestion, Applicability::Unspecified);
+                                                                              sp,
+                                                                              msg,
+                                                                              suggestion,
+                                                                              Applicability::Unspecified,
+                                                                              );
                                     }
                                 }
                                 _ => {
@@ -1330,13 +1338,14 @@ impl<'a, 'tcx> BorrowckCtxt<'a, 'tcx> {
                                                   &cmt_path_or_string,
                                                   capture_span,
                                                   Origin::Ast)
-            .span_suggestion_with_applicability(err.span,
-                             &format!("to force the closure to take ownership of {} \
-                                       (and any other referenced variables), \
-                                       use the `move` keyword",
-                                       cmt_path_or_string),
-                             suggestion,
-                             Applicability::Unspecified,
+            .span_suggestion_with_applicability(
+                                         err.span,
+                                         &format!("to force the closure to take ownership of {} \
+                                                   (and any other referenced variables), \
+                                                   use the `move` keyword",
+                                                   cmt_path_or_string),
+                                         suggestion,
+                                         Applicability::Unspecified,
             )
             .emit();
         self.signal_error();

src/librustc_errors/diagnostic.rs

@@ -307,10 +307,10 @@ impl Diagnostic {
         suggestion: Vec<(Span, String)>,
     ) -> &mut Self {
         self.multipart_suggestion_with_applicability(
-                                                     msg,
-                                                     suggestion,
-                                                     Applicability::Unspecified
-                                                    )
+                                                 msg,
+                                                 suggestion,
+                                                 Applicability::Unspecified,
+        )
     }
 
     /// Prints out a message with multiple suggested edits of the code.

src/librustc_errors/diagnostic_builder.rs

@@ -172,9 +172,10 @@ impl<'a> DiagnosticBuilder<'a> {
                                                   -> &mut Self);
 
     #[deprecated(note = "Use `span_suggestion_short_with_applicability`")]
-    forward!(pub fn span_suggestion_short(&mut self,
-                                          sp: Span,
-                                          msg: &str,
+    forward!(pub fn span_suggestion_short(
+                                      &mut self,
+                                      sp: Span,
+                                      msg: &str,
                                           suggestion: String)
                                           -> &mut Self);
 

src/librustc_passes/loops.rs

@@ -141,7 +141,8 @@ impl<'a, 'hir> Visitor<'hir> for CheckLoopVisitor<'a, 'hir> {
                                 .span_label(e.span,
                                             "can only break with a value inside \
                                             `loop` or breakable block")
-                                .span_suggestion_with_applicability(e.span,
+                                .span_suggestion_with_applicability(
+                                                 e.span,
                                                  &format!("instead, use `break` on its own \
                                                            without a value inside this `{}` loop",
                                                           kind.name()),

src/librustc_resolve/lib.rs

@@ -3299,7 +3299,8 @@ impl<'a, 'crateloader: 'a> Resolver<'a, 'crateloader> {
                         err.span_label(base_span,
                                        "expecting a type here because of type ascription");
                         if line_sp != line_base_sp {
-                            err.span_suggestion_short_with_applicability(sp,
+                            err.span_suggestion_short_with_applicability(
+                                                      sp,
                                                       "did you mean to use `;` here instead?",
                                                       ";".to_string(),
                                                       Applicability::Unspecified,