add tests, bytes -> chars

Author: wada314

tests/system.rs

@@ -19,7 +19,7 @@ use std::fs;
 use std::io::{self, BufRead, BufReader, Read};
 use std::iter::Peekable;
 use std::path::{Path, PathBuf};
-use std::str::Bytes;
+use std::str::Chars;
 
 use rustfmt::*;
 use rustfmt::filemap::{write_system_newlines, FileMap};
@@ -436,22 +436,22 @@ fn rustfmt_diff_no_diff_test() {
 
 // Compare strings without distinguishing between CRLF and LF
 fn string_eq_ignore_newline_repr(left: &str, right: &str) -> bool {
-    let left = BytesIgnoreNewlineRepr(left.bytes().peekable());
-    let right = BytesIgnoreNewlineRepr(right.bytes().peekable());
+    let left = CharsIgnoreNewlineRepr(left.chars().peekable());
+    let right = CharsIgnoreNewlineRepr(right.chars().peekable());
     left.eq(right)
 }
 
-struct BytesIgnoreNewlineRepr<'a>(Peekable<Bytes<'a>>);
+struct CharsIgnoreNewlineRepr<'a>(Peekable<Chars<'a>>);
 
-impl<'a> Iterator for BytesIgnoreNewlineRepr<'a> {
-    type Item = u8;
-    fn next(&mut self) -> Option<u8> {
-        self.0.next().map(|c| if c == b'\r' {
-            if *self.0.peek().unwrap_or(&0) == b'\n' {
+impl<'a> Iterator for CharsIgnoreNewlineRepr<'a> {
+    type Item = char;
+    fn next(&mut self) -> Option<char> {
+        self.0.next().map(|c| if c == '\r' {
+            if *self.0.peek().unwrap_or(&'\0') == '\n' {
                 self.0.next();
-                b'\n'
+                '\n'
             } else {
-                b'\r'
+                '\r'
             }
         } else {
             c
@@ -461,5 +461,10 @@ impl<'a> Iterator for BytesIgnoreNewlineRepr<'a> {
 
 #[test]
 fn string_eq_ignore_newline_repr_test() {
+    assert!(string_eq_ignore_newline_repr("", ""));
+    assert!(!string_eq_ignore_newline_repr("", "abc"));
+    assert!(!string_eq_ignore_newline_repr("abc", ""));
     assert!(string_eq_ignore_newline_repr("a\nb\nc\rd", "a\nb\r\nc\rd"));
+    assert!(string_eq_ignore_newline_repr("a\r\n\r\n\r\nb", "a\n\n\nb"));
+    assert!(!string_eq_ignore_newline_repr("a\r\nbcd", "a\nbcdefghijk"));
 }