run cargo fmt

src/app.rs

@@ -364,22 +364,24 @@ impl App {
         let paging_mode = match self.matches.value_of("paging") {
             Some("always") => PagingMode::Always,
             Some("never") => PagingMode::Never,
-            Some("auto") | _ => if files.contains(&InputFile::StdIn) {
+            Some("auto") | _ => {
-                // If we are reading from stdin, only enable paging if we write to an
+                if files.contains(&InputFile::StdIn) {
-                // interactive terminal and if we do not *read* from an interactive
+                    // If we are reading from stdin, only enable paging if we write to an
-                // terminal.
+                    // interactive terminal and if we do not *read* from an interactive
-                if self.interactive_output && !atty::is(Stream::Stdin) {
+                    // terminal.
-                    PagingMode::QuitIfOneScreen
+                    if self.interactive_output && !atty::is(Stream::Stdin) {
+                        PagingMode::QuitIfOneScreen
+                    } else {
+                        PagingMode::Never
+                    }
                 } else {
-                    PagingMode::Never
+                    if self.interactive_output {
+                        PagingMode::QuitIfOneScreen
+                    } else {
+                        PagingMode::Never
+                    }
                 }
-            } else {
+            }
-                if self.interactive_output {
-                    PagingMode::QuitIfOneScreen
-                } else {
-                    PagingMode::Never
-                }
-            },
         };
 
         Ok(Config {
@@ -393,11 +395,13 @@ impl App {
                 match self.matches.value_of("wrap") {
                     Some("character") => OutputWrap::Character,
                     Some("never") => OutputWrap::None,
-                    Some("auto") | _ => if output_components.plain() {
+                    Some("auto") | _ => {
-                        OutputWrap::None
+                        if output_components.plain() {
-                    } else {
+                            OutputWrap::None
-                        OutputWrap::Character
+                        } else {
-                    },
+                            OutputWrap::Character
+                        }
+                    }
                 }
             },
             colored_output: match self.matches.value_of("color") {
@@ -450,8 +454,10 @@ impl App {
                         } else {
                             InputFile::Ordinary(filename)
                         }
-                    }).collect()
+                    })
-            }).unwrap_or_else(|| vec![InputFile::StdIn])
+                    .collect()
+            })
+            .unwrap_or_else(|| vec![InputFile::StdIn])
     }
 
     fn output_components(&self) -> Result<OutputComponents> {

src/printer.rs

@@ -319,7 +319,8 @@ impl<'a> Printer for InteractivePrinter<'a> {
                                                 .iter()
                                                 .map(|ref d| d
                                                     .generate(line_number, true, self)
-                                                    .text).collect::<Vec<String>>()
+                                                    .text)
+                                                .collect::<Vec<String>>()
                                                 .join(" ")
                                         ))
                                     } else {

src/style.rs

@@ -23,11 +23,13 @@ pub enum OutputWrap {
 impl OutputComponent {
     pub fn components(&self, interactive_terminal: bool) -> &'static [OutputComponent] {
         match *self {
-            OutputComponent::Auto => if interactive_terminal {
+            OutputComponent::Auto => {
-                OutputComponent::Full.components(interactive_terminal)
+                if interactive_terminal {
-            } else {
+                    OutputComponent::Full.components(interactive_terminal)
-                OutputComponent::Plain.components(interactive_terminal)
+                } else {
-            },
+                    OutputComponent::Plain.components(interactive_terminal)
+                }
+            }
             OutputComponent::Changes => &[OutputComponent::Changes],
             OutputComponent::Grid => &[OutputComponent::Grid],
             OutputComponent::Header => &[OutputComponent::Header],

tests/tester.rs

@@ -50,7 +50,8 @@ impl BatTester {
                 &format!("--wrap={}", if wrap { "character" } else { "never" }),
                 &format!("--tabs={}", tab_width),
                 &format!("--style={}", style),
-            ]).output()
+            ])
+            .output()
             .expect("bat failed");
 
         // have to do the replace because the filename in the header changes based on the current working directory