formatting

Author: Cameron-Low

lints/fold/src/hashmap.rs

@@ -1,8 +1,8 @@
 use rustc_errors::Applicability;
 use rustc_hir::{Expr, ExprKind};
 use rustc_lint::{LateContext, LateLintPass, LintContext};
-use rustc_span::Symbol;
 use rustc_span::sym;
+use rustc_span::Symbol;
 use utils::span_to_snippet_macro;
 
 dylint_linting::declare_late_lint! {
@@ -57,17 +57,26 @@ impl<'tcx> LateLintPass<'tcx> for FoldHashmap {
             // Type check the accumulated parameter and assign the correct identity.
             // Attempting to match 'c.insert(v);'
 
-            let ExprKind::MethodCall(iseg, irecv, _iargs, _ispan) = &pat_expr.kind else { return; };
+            let ExprKind::MethodCall(iseg, irecv, _iargs, _ispan) = &pat_expr.kind else {
+                return;
+            };
             // Vector specific insert method
             if iseg.ident.name != Symbol::intern("insert") {
                 return;
             }
             // Make sure the receiver is a variable/path to variable.
-            let ExprKind::Path(_) = irecv.kind else { return; };
+            let ExprKind::Path(_) = irecv.kind else {
+                return;
+            };
 
             // Make sure that this is the hashmap method call
-            let ty = cx.tcx.typeck(irecv.hir_id.owner.def_id).node_type(irecv.hir_id);
-            let Some(adt) = ty.ty_adt_def() else { return; };
+            let ty = cx
+                .tcx
+                .typeck(irecv.hir_id.owner.def_id)
+                .node_type(irecv.hir_id);
+            let Some(adt) = ty.ty_adt_def() else {
+                return;
+            };
             let did = adt.did();
             if !cx.tcx.is_diagnostic_item(sym::HashMap, did) {
                 return;

lints/fold/src/lib.rs

@@ -4,9 +4,9 @@
 
 extern crate rustc_errors;
 extern crate rustc_hir;
-extern crate rustc_span;
 extern crate rustc_lint;
 extern crate rustc_session;
+extern crate rustc_span;
 
 mod hashmap;
 mod simple;

lints/fold/src/vec.rs

@@ -1,8 +1,8 @@
 use rustc_errors::Applicability;
 use rustc_hir::{Expr, ExprKind};
 use rustc_lint::{LateContext, LateLintPass, LintContext};
-use rustc_span::Symbol;
 use rustc_span::sym;
+use rustc_span::Symbol;
 use utils::span_to_snippet_macro;
 
 dylint_linting::declare_late_lint! {
@@ -57,17 +57,26 @@ impl<'tcx> LateLintPass<'tcx> for FoldVec {
             // Type check the accumulated parameter and assign the correct identity.
             // Attempting to match 'c.push(v);'
 
-            let ExprKind::MethodCall(iseg, irecv, _iargs, _ispan) = &pat_expr.kind else { return; };
+            let ExprKind::MethodCall(iseg, irecv, _iargs, _ispan) = &pat_expr.kind else {
+                return;
+            };
             // Vector specific insert method
             if iseg.ident.name != Symbol::intern("push") {
                 return;
             }
             // Make sure the receiver is a variable/path to variable.
-            let ExprKind::Path(_) = irecv.kind else { return; };
+            let ExprKind::Path(_) = irecv.kind else {
+                return;
+            };
 
             // Make sure that this is the vec method call
-            let ty = cx.tcx.typeck(irecv.hir_id.owner.def_id).node_type(irecv.hir_id);
-            let Some(adt) = ty.ty_adt_def() else { return; };
+            let ty = cx
+                .tcx
+                .typeck(irecv.hir_id.owner.def_id)
+                .node_type(irecv.hir_id);
+            let Some(adt) = ty.ty_adt_def() else {
+                return;
+            };
             let did = adt.did();
             if !cx.tcx.is_diagnostic_item(sym::Vec, did) {
                 return;

lints/par_fold/src/lib.rs

@@ -14,8 +14,8 @@ extern crate rustc_session;
 extern crate rustc_span;
 
 mod par_fold_simple;
-mod vec;
 mod rayon_import;
+mod vec;
 
 #[allow(clippy::no_mangle_with_rust_abi)]
 #[cfg_attr(not(feature = "rlib"), no_mangle)]

lints/par_fold/src/vec.rs

@@ -62,7 +62,8 @@ impl<'tcx> LateLintPass<'tcx> for ParFoldVec {
 
             let fold_snip = format!("fold(|| Vec::new(), {cls_snip})");
             let reduce_snip = "reduce(|| Vec::new(), |mut a, b| { a.extend(b); a })";
-            let mut extend_snip = format!("{{ {id_snip}.extend({recv_snip}.{fold_snip}.{reduce_snip}); {id_snip} }}");
+            let mut extend_snip =
+                format!("{{ {id_snip}.extend({recv_snip}.{fold_snip}.{reduce_snip}); {id_snip} }}");
             extend_snip = extend_snip.replace(".iter()", ".par_iter()");
             extend_snip = extend_snip.replace(".iter_mut()", ".par_iter_mut()");
             extend_snip = extend_snip.replace(".into_iter()", ".into_par_iter()");

utils/src/lib.rs

@@ -84,17 +84,15 @@ pub fn get_pat_expr_and_spans<'a>(
     Ok((pat_expr, local_defs_span, body_span))
 }
 
-pub fn get_penult_stmt<'a>(
-    expr: &'a Expr<'a>,
-) -> Result<&'a Stmt<'a>, ()> {
+pub fn get_penult_stmt<'a>(expr: &'a Expr<'a>) -> Result<&'a Stmt<'a>, ()> {
     if let ExprKind::Block(block, _) = &expr.kind {
         match block.stmts.len() {
             0 => Err(()),
             l => {
                 if l == 1 && block.expr.is_none() {
                     Err(())
                 } else {
-                  Ok(&block.stmts[l - 1])
+                    Ok(&block.stmts[l - 1])
                 }
             }
         }