Merge pull request #2693 from gnzlbg/integration

[rust.git] / src / rustfmt_diff.rs

diff --git a/src/rustfmt_diff.rs b/src/rustfmt_diff.rs
index d5c97b95560daed89097e90335c1ccc21e4fec4a..f2acc96a8deb9d1cd442fd99b75a7c4a4c91fddd 100644 (file)
--- a/src/rustfmt_diff.rs
+++ b/src/rustfmt_diff.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use config::Color;
+use config::{Color, Config, Verbosity};
 use diff;
 use std::collections::VecDeque;
 use std::io;
@@ -149,25 +149,36 @@ pub fn make_diff(expected: &str, actual: &str, context_size: usize) -> Vec<Misma
     results
 }
 
-pub fn print_diff<F>(diff: Vec<Mismatch>, get_section_title: F, color: Color)
+pub fn print_diff<F>(diff: Vec<Mismatch>, get_section_title: F, config: &Config)
 where
     F: Fn(u32) -> String,
 {
+    let color = config.color();
+    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);
-        writer.writeln(&format!("{}", title), None);
+        writer.writeln(&title, None);
 
         for line in mismatch.lines {
             match line {
-                DiffLine::Context(ref str) => writer.writeln(&format!(" {}⏎", str), None),
-                DiffLine::Expected(ref str) => {
-                    writer.writeln(&format!("+{}⏎", str), Some(term::color::GREEN))
-                }
-                DiffLine::Resulting(ref str) => {
-                    writer.writeln(&format!("-{}⏎", str), Some(term::color::RED))
+                DiffLine::Context(ref str) => {
+                    writer.writeln(&format!(" {}{}", str, line_terminator), None)
                 }
+                DiffLine::Expected(ref str) => writer.writeln(
+                    &format!("+{}{}", str, line_terminator),
+                    Some(term::color::GREEN),
+                ),
+                DiffLine::Resulting(ref str) => writer.writeln(
+                    &format!("-{}{}", str, line_terminator),
+                    Some(term::color::RED),
+                ),
             }
         }
     }