Merge pull request #3035 from topecongiro/issue-3006

[rust.git] / src / rustfmt_diff.rs

diff --git a/src/rustfmt_diff.rs b/src/rustfmt_diff.rs
index 178ed99f69608ac06376f5b72ac3edafac0a4a97..4e0ac31e312eeab4fa4155b0a99e0c8fb385b8f5 100644 (file)
--- a/src/rustfmt_diff.rs
+++ b/src/rustfmt_diff.rs
@@ -8,13 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use config::{Color, Config};
+use config::{Color, Config, Verbosity};
 use diff;
 use std::collections::VecDeque;
 use std::io;
 use std::io::Write;
-use term;
-use utils::use_colored_tty;
 
 #[derive(Debug, PartialEq)]
 pub enum DiffLine {
@@ -54,7 +52,7 @@ impl OutputWriter {
     // for colorized output and the capabilities of the terminal.
     pub fn new(color: Color) -> Self {
         if let Some(t) = term::stdout() {
-            if use_colored_tty(color) && t.supports_color() {
+            if color.use_colored_tty() && t.supports_color() {
                 return OutputWriter { terminal: Some(t) };
             }
         }
@@ -154,12 +152,16 @@ pub fn print_diff<F>(diff: Vec<Mismatch>, get_section_title: F, config: &Config)
     F: Fn(u32) -> String,
 {
     let color = config.color();
-    let line_terminator = if config.verbose_diff() { "⏎" } else { "" };
+    let line_terminator = if config.verbose() == Verbosity::Verbose {
+        "⏎"
+    } else {
+        ""
+    };
 
     let mut writer = OutputWriter::new(color);
 
     for mismatch in diff {
-        let title = get_section_title(mismatch.line_number);
+        let title = get_section_title(mismatch.line_number_orig);
         writer.writeln(&title, None);
 
         for line in mismatch.lines {
@@ -191,13 +193,15 @@ pub fn output_modified<W>(mut out: W, diff: Vec<Mismatch>)
     W: Write,
 {
     for mismatch in diff {
-        let (num_removed, num_added) = mismatch.lines.iter().fold((0, 0), |(rem, add), line| {
-            match *line {
-                DiffLine::Context(_) => panic!("No Context expected"),
-                DiffLine::Expected(_) => (rem, add + 1),
-                DiffLine::Resulting(_) => (rem + 1, add),
-            }
-        });
+        let (num_removed, num_added) =
+            mismatch
+                .lines
+                .iter()
+                .fold((0, 0), |(rem, add), line| match *line {
+                    DiffLine::Context(_) => panic!("No Context expected"),
+                    DiffLine::Expected(_) => (rem, add + 1),
+                    DiffLine::Resulting(_) => (rem + 1, add),
+                });
         // Write a header with enough information to separate the modified lines.
         writeln!(
             out,