Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-25 20:43:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #14

Browse source 
14: Normalize test newlines r=matklad a=CAD97

Tests pass with CRLF newlines now
This commit is contained in:
bors[bot] 2018-01-28 00:24:27 +00:00
commit 6d3caf58ca
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
tests/testutils/src/lib.rs
View file

@ -6,6 +6,21 @@ use std::fs::read_dir;
use difference::Changeset; use difference::Changeset;
/// Read file and normalize newlines.
///
/// `rustc` seems to always normalize `\r\n` newlines to `\n`:
///
/// ```
/// let s = "
/// ";
/// assert_eq!(s.as_bytes(), &[10]);
/// ```
///
/// so this should always be correct.
fn read_text(path: &Path) -> String {
file::get_text(path).unwrap().replace("\r\n", "\n")
}
pub fn dir_tests<F>( pub fn dir_tests<F>(
paths: &[&str], paths: &[&str],
f: F f: F
@ -15,7 +30,7 @@ where
{ {
for path in collect_tests(paths) { for path in collect_tests(paths) {
let actual = { let actual = {
let text = file::get_text(&path).unwrap(); let text = read_text(&path);
f(&text) f(&text)
}; };
let path = path.with_extension("txt"); let path = path.with_extension("txt");
@ -25,7 +40,7 @@ where
file::put_text(&path, actual).unwrap(); file::put_text(&path, actual).unwrap();
panic!("No expected result") panic!("No expected result")
} }
let expected = file::get_text(&path).unwrap(); let expected = read_text(&path);
let expected = expected.as_str(); let expected = expected.as_str();
let actual = actual.as_str(); let actual = actual.as_str();
assert_equal_text(expected, actual, &path); assert_equal_text(expected, actual, &path);