about summary refs log tree commit diff
diff options
context:
space:
mode:
authorIgor Matuszewski <Xanewok@gmail.com>2019-03-04 18:28:25 +0100
committerIgor Matuszewski <Xanewok@gmail.com>2019-03-04 18:28:25 +0100
commit6b993c8b8b72faa3b768ffef52a42c19ac134227 (patch)
treeb9bbb613591cbc29a4be28b409732483f00eceb9
parent8aa0f44d15fe133f10830e4b58cd20f207bbf769 (diff)
Fix stdin_works... test on Windows
-rw-r--r--src/test/mod.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/mod.rs b/src/test/mod.rs
index 24772d70c16..1992190bb62 100644
--- a/src/test/mod.rs
+++ b/src/test/mod.rs
@@ -8,7 +8,7 @@ use std::path::{Path, PathBuf};
 use std::process::{Command, Stdio};
 use std::str::Chars;
 
-use crate::config::{Color, Config, EmitMode, FileName, ReportTactic};
+use crate::config::{Color, Config, EmitMode, FileName, NewlineStyle, ReportTactic};
 use crate::formatting::{ReportedErrors, SourceFile};
 use crate::rustfmt_diff::{make_diff, print_diff, DiffLine, Mismatch, ModifiedChunk, OutputWriter};
 use crate::source_file;
@@ -299,6 +299,7 @@ fn stdin_works_with_modified_lines() {
 
     let input = Input::Text(input.to_owned());
     let mut config = Config::default();
+    config.set().newline_style(NewlineStyle::Unix);
     config.set().emit_mode(EmitMode::ModifiedLines);
     let mut buf: Vec<u8> = vec![];
     {
@@ -310,8 +311,7 @@ fn stdin_works_with_modified_lines() {
         };
         assert_eq!(session.errors, errors);
     }
-    let newline = if cfg!(windows) { "\r\n" } else { "\n" };
-    assert_eq!(buf, output.replace('\n', newline).as_bytes());
+    assert_eq!(buf, output.as_bytes());
 }
 
 #[test]