refactor - minor changes

src/cargo-fmt/test/mod.rs

@@ -46,26 +46,34 @@ fn good_options() {
 
 #[test]
 fn unexpected_option() {
-    assert!(Opts::command()
-        .try_get_matches_from(["test", "unexpected"])
-        .is_err());
+    assert!(
+        Opts::command()
+            .try_get_matches_from(["test", "unexpected"])
+            .is_err()
+    );
 }
 
 #[test]
 fn unexpected_flag() {
-    assert!(Opts::command()
-        .try_get_matches_from(["test", "--flag"])
-        .is_err());
+    assert!(
+        Opts::command()
+            .try_get_matches_from(["test", "--flag"])
+            .is_err()
+    );
 }
 
 #[test]
 fn mandatory_separator() {
-    assert!(Opts::command()
-        .try_get_matches_from(["test", "--emit"])
-        .is_err());
-    assert!(Opts::command()
-        .try_get_matches_from(["test", "--", "--emit"])
-        .is_ok());
+    assert!(
+        Opts::command()
+            .try_get_matches_from(["test", "--emit"])
+            .is_err()
+    );
+    assert!(
+        Opts::command()
+            .try_get_matches_from(["test", "--", "--emit"])
+            .is_ok()
+    );
 }
 
 #[test]
@@ -98,28 +106,36 @@ fn multiple_packages_grouped() {
 
 #[test]
 fn empty_packages_1() {
-    assert!(Opts::command()
-        .try_get_matches_from(["test", "-p"])
-        .is_err());
+    assert!(
+        Opts::command()
+            .try_get_matches_from(["test", "-p"])
+            .is_err()
+    );
 }
 
 #[test]
 fn empty_packages_2() {
-    assert!(Opts::command()
-        .try_get_matches_from(["test", "-p", "--", "--check"])
-        .is_err());
+    assert!(
+        Opts::command()
+            .try_get_matches_from(["test", "-p", "--", "--check"])
+            .is_err()
+    );
 }
 
 #[test]
 fn empty_packages_3() {
-    assert!(Opts::command()
-        .try_get_matches_from(["test", "-p", "--verbose"])
-        .is_err());
+    assert!(
+        Opts::command()
+            .try_get_matches_from(["test", "-p", "--verbose"])
+            .is_err()
+    );
 }
 
 #[test]
 fn empty_packages_4() {
-    assert!(Opts::command()
-        .try_get_matches_from(["test", "-p", "--check"])
-        .is_err());
+    assert!(
+        Opts::command()
+            .try_get_matches_from(["test", "-p", "--check"])
+            .is_err()
+    );
 }

src/comment.rs

@@ -160,10 +160,7 @@ pub(crate) fn combine_strs_with_missing_comments(
 ) -> RewriteResult {
     trace!(
         "combine_strs_with_missing_comments `{}` `{}` {:?} {:?}",
-        prev_str,
-        next_str,
-        span,
-        shape
+        prev_str, next_str, span, shape
     );
 
     let mut result =

src/config/mod.rs

@@ -365,7 +365,7 @@ impl Config {
 
     #[allow(dead_code)]
     pub(super) fn from_toml(toml: &str, file_path: &Path) -> Result<Config, String> {
-        Self::from_toml_for_style_edition(toml,file_path, None, None, None)
+        Self::from_toml_for_style_edition(toml, file_path, None, None, None)
     }
 
     pub(crate) fn from_toml_for_style_edition(
@@ -397,21 +397,17 @@ impl Config {
                 Ok(parsed_config.to_parsed_config(style_edition, edition, version, file_path))
             }
             Err(e) => {
+                let config_file_path_str = file_path.to_string_lossy();
 
-            let config_file_path_str = file_path.to_string_lossy();
-
-                    let err_msg = format!(
-                        "The file `{}` failed to parse.\n\
+                let err_msg = format!(
+                    "The file `{}` failed to parse.\n\
                          Error details: {}\n\
                          Help: Ensure that the configuration file at `{}` is correctly formatted.",
-                        config_file_path_str,
-                        e,
-                        config_file_path_str
-                    );
-
-                    Err(err_msg)
-                }
+                    config_file_path_str, e, config_file_path_str
+                );
 
+                Err(err_msg)
+            }
         }
     }
 }

src/format-diff/main.rs

@@ -248,29 +248,37 @@ mod cmd_line_tests {
 
     #[test]
     fn unexpected_option() {
-        assert!(Opts::command()
-            .try_get_matches_from(["test", "unexpected"])
-            .is_err());
+        assert!(
+            Opts::command()
+                .try_get_matches_from(["test", "unexpected"])
+                .is_err()
+        );
     }
 
     #[test]
     fn unexpected_flag() {
-        assert!(Opts::command()
-            .try_get_matches_from(["test", "--flag"])
-            .is_err());
+        assert!(
+            Opts::command()
+                .try_get_matches_from(["test", "--flag"])
+                .is_err()
+        );
     }
 
     #[test]
     fn overridden_option() {
-        assert!(Opts::command()
-            .try_get_matches_from(["test", "-p", "10", "-p", "20"])
-            .is_err());
+        assert!(
+            Opts::command()
+                .try_get_matches_from(["test", "-p", "10", "-p", "20"])
+                .is_err()
+        );
     }
 
     #[test]
     fn negative_filter() {
-        assert!(Opts::command()
-            .try_get_matches_from(["test", "-p", "-1"])
-            .is_err());
+        assert!(
+            Opts::command()
+                .try_get_matches_from(["test", "-p", "-1"])
+                .is_err()
+        );
     }
 }

src/imports.rs

@@ -803,10 +803,12 @@ fn merge_rest(
             DUMMY_SP,
         )];
         match rest {
-            [UseSegment {
-                kind: UseSegmentKind::List(rest_list),
-                ..
-            }] => list.extend(rest_list.clone()),
+            [
+                UseSegment {
+                    kind: UseSegmentKind::List(rest_list),
+                    ..
+                },
+            ] => list.extend(rest_list.clone()),
             _ => list.push(UseTree::from_path(rest.to_vec(), DUMMY_SP)),
         }
         return Some(vec![