Format source codes

rust-lang · Jul 11, 2017 · e3310a6 · e3310a6
1 parent 08f3f03
commit e3310a6
Show file tree

Hide file tree

Showing 15 changed files with 350 additions and 480 deletions.
diff --git a/src/bin/cargo-fmt.rs b/src/bin/cargo-fmt.rs
@@ -90,13 +90,11 @@ fn execute() -> i32 {
             print_usage(&opts, &e.to_string());
             failure
         }
-        Ok(status) => {
-            if status.success() {
-                success
-            } else {
-                status.code().unwrap_or(failure)
-            }
-        }
+        Ok(status) => if status.success() {
+            success
+        } else {
+            status.code().unwrap_or(failure)
+        },
     }
 }
 
@@ -324,12 +322,10 @@ fn format_files(
         .args(fmt_args)
         .spawn()
         .map_err(|e| match e.kind() {
-            std::io::ErrorKind::NotFound => {
-                std::io::Error::new(
-                    std::io::ErrorKind::Other,
-                    "Could not run rustfmt, please make sure it is in your PATH.",
-                )
-            }
+            std::io::ErrorKind::NotFound => std::io::Error::new(
+                std::io::ErrorKind::Other,
+                "Could not run rustfmt, please make sure it is in your PATH.",
+            ),
             _ => e,
         })?;
     command.wait()

diff --git a/src/chains.rs b/src/chains.rs
@@ -444,12 +444,10 @@ fn rewrite_method_call_with_overflow(
             None => return false,
         };
         let types = match segment.parameters {
-            Some(ref params) => {
-                match **params {
-                    ast::PathParameters::AngleBracketed(ref data) => &data.types[..],
-                    _ => &[],
-                }
-            }
+            Some(ref params) => match **params {
+                ast::PathParameters::AngleBracketed(ref data) => &data.types[..],
+                _ => &[],
+            },
             _ => &[],
         };
         let mut last_rewrite = rewrite_method_call(
@@ -516,12 +514,10 @@ fn rewrite_chain_subexpr(
     match expr.node {
         ast::ExprKind::MethodCall(ref segment, ref expressions) => {
             let types = match segment.parameters {
-                Some(ref params) => {
-                    match **params {
-                        ast::PathParameters::AngleBracketed(ref data) => &data.types[..],
-                        _ => &[],
-                    }
-                }
+                Some(ref params) => match **params {
+                    ast::PathParameters::AngleBracketed(ref data) => &data.types[..],
+                    _ => &[],
+                },
                 _ => &[],
             };
             rewrite_method_call(segment.identifier, types, expressions, span, context, shape)

diff --git a/src/comment.rs b/src/comment.rs
@@ -342,14 +342,12 @@ impl FindUncommented for str {
                 None => {
                     return Some(i - pat.len());
                 }
-                Some(c) => {
-                    match kind {
-                        FullCodeCharKind::Normal if b == c => {}
-                        _ => {
-                            needle_iter = pat.chars();
-                        }
+                Some(c) => match kind {
+                    FullCodeCharKind::Normal if b == c => {}
+                    _ => {
+                        needle_iter = pat.chars();
                     }
-                }
+                },
             }
         }
 
@@ -494,42 +492,34 @@ where
         let item = try_opt!(self.base.next());
         let chr = item.get_char();
         self.status = match self.status {
-            CharClassesStatus::LitString => {
-                match chr {
-                    '"' => CharClassesStatus::Normal,
-                    '\\' => CharClassesStatus::LitStringEscape,
-                    _ => CharClassesStatus::LitString,
-                }
-            }
+            CharClassesStatus::LitString => match chr {
+                '"' => CharClassesStatus::Normal,
+                '\\' => CharClassesStatus::LitStringEscape,
+                _ => CharClassesStatus::LitString,
+            },
             CharClassesStatus::LitStringEscape => CharClassesStatus::LitString,
-            CharClassesStatus::LitChar => {
-                match chr {
-                    '\\' => CharClassesStatus::LitCharEscape,
-                    '\'' => CharClassesStatus::Normal,
-                    _ => CharClassesStatus::LitChar,
-                }
-            }
+            CharClassesStatus::LitChar => match chr {
+                '\\' => CharClassesStatus::LitCharEscape,
+                '\'' => CharClassesStatus::Normal,
+                _ => CharClassesStatus::LitChar,
+            },
             CharClassesStatus::LitCharEscape => CharClassesStatus::LitChar,
-            CharClassesStatus::Normal => {
-                match chr {
-                    '"' => CharClassesStatus::LitString,
-                    '\'' => CharClassesStatus::LitChar,
-                    '/' => {
-                        match self.base.peek() {
-                            Some(next) if next.get_char() == '*' => {
-                                self.status = CharClassesStatus::BlockCommentOpening(1);
-                                return Some((FullCodeCharKind::StartComment, item));
-                            }
-                            Some(next) if next.get_char() == '/' => {
-                                self.status = CharClassesStatus::LineComment;
-                                return Some((FullCodeCharKind::StartComment, item));
-                            }
-                            _ => CharClassesStatus::Normal,
-                        }
+            CharClassesStatus::Normal => match chr {
+                '"' => CharClassesStatus::LitString,
+                '\'' => CharClassesStatus::LitChar,
+                '/' => match self.base.peek() {
+                    Some(next) if next.get_char() == '*' => {
+                        self.status = CharClassesStatus::BlockCommentOpening(1);
+                        return Some((FullCodeCharKind::StartComment, item));
+                    }
+                    Some(next) if next.get_char() == '/' => {
+                        self.status = CharClassesStatus::LineComment;
+                        return Some((FullCodeCharKind::StartComment, item));
                     }
                     _ => CharClassesStatus::Normal,
-                }
-            }
+                },
+                _ => CharClassesStatus::Normal,
+            },
             CharClassesStatus::BlockComment(deepness) => {
                 assert!(deepness != 0);
                 self.status = match self.base.peek() {
@@ -558,18 +548,16 @@ where
                     return Some((FullCodeCharKind::InComment, item));
                 }
             }
-            CharClassesStatus::LineComment => {
-                match chr {
-                    '\n' => {
-                        self.status = CharClassesStatus::Normal;
-                        return Some((FullCodeCharKind::EndComment, item));
-                    }
-                    _ => {
-                        self.status = CharClassesStatus::LineComment;
-                        return Some((FullCodeCharKind::InComment, item));
-                    }
+            CharClassesStatus::LineComment => match chr {
+                '\n' => {
+                    self.status = CharClassesStatus::Normal;
+                    return Some((FullCodeCharKind::EndComment, item));
                 }
-            }
+                _ => {
+                    self.status = CharClassesStatus::LineComment;
+                    return Some((FullCodeCharKind::InComment, item));
+                }
+            },
         };
         Some((FullCodeCharKind::Normal, item))
     }

diff --git a/src/config.rs b/src/config.rs
@@ -482,11 +482,9 @@ pub fn get_toml_path(dir: &Path) -> Result<Option<PathBuf>, Error> {
             Ok(ref md) if md.is_file() => return Ok(Some(config_file)),
             // Return the error if it's something other than `NotFound`; otherwise we didn't
             // find the project file yet, and continue searching.
-            Err(e) => {
-                if e.kind() != ErrorKind::NotFound {
-                    return Err(e);
-                }
-            }
+            Err(e) => if e.kind() != ErrorKind::NotFound {
+                return Err(e);
+            },
             _ => {}
         }
     }