code cleanup

Author: chenyukang

compiler/rustc_borrowck/src/diagnostics/move_errors.rs

@@ -699,13 +699,17 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
                         place: &place_desc,
                         span,
                     });
-                } else if self.should_suggest_pattern_binding_instead(span, &binds_to)
-                    && let Some(desugar_spans) = self.add_move_error_suggestions(err, &binds_to)
-                {
-                    self.add_move_error_details(err, &binds_to, &desugar_spans);
                 } else {
-                    self.add_borrow_suggestions(err, span, true);
-                    self.add_move_error_details(err, &binds_to, &[]);
+                    let pattern_binding_suggestion = self
+                        .should_suggest_pattern_binding_instead(span, &binds_to)
+                        .then(|| self.add_move_error_suggestions(err, &binds_to))
+                        .flatten();
+                    if let Some(desugar_spans) = pattern_binding_suggestion {
+                        self.add_move_error_details(err, &binds_to, &desugar_spans);
+                    } else {
+                        self.add_borrow_suggestions(err, span, true);
+                        self.add_move_error_details(err, &binds_to, &[]);
+                    }
                 }
             }
             GroupedMoveError::MovesFromValue { mut binds_to, .. } => {