vscode failed to merge...

Author: wada314

tests/system.rs

@@ -19,11 +19,7 @@ use std::fs;
 use std::io::{self, BufRead, BufReader, Read};
 use std::iter::Peekable;
 use std::path::{Path, PathBuf};
-<<<<<<< HEAD
 use std::str::Chars;
-=======
-use std::str::Bytes;
->>>>>>> c41b45169a6a8b461d6615fb59ade61182daf5f5
 
 use rustfmt::*;
 use rustfmt::filemap::{write_system_newlines, FileMap};
@@ -440,7 +436,6 @@ 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 {
-<<<<<<< HEAD
     let left = CharsIgnoreNewlineRepr(left.chars().peekable());
     let right = CharsIgnoreNewlineRepr(right.chars().peekable());
     left.eq(right)
@@ -457,24 +452,6 @@ impl<'a> Iterator for CharsIgnoreNewlineRepr<'a> {
                 '\n'
             } else {
                 '\r'
-=======
-    let left = BytesIgnoreNewlineRepr(left.bytes().peekable());
-    let right = BytesIgnoreNewlineRepr(right.bytes().peekable());
-    left.eq(right)
-}
-
-struct BytesIgnoreNewlineRepr<'a>(Peekable<Bytes<'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' {
-                self.0.next();
-                b'\n'
-            } else {
-                b'\r'
->>>>>>> c41b45169a6a8b461d6615fb59ade61182daf5f5
             }
         } else {
             c
@@ -484,14 +461,10 @@ impl<'a> Iterator for BytesIgnoreNewlineRepr<'a> {
 
 #[test]
 fn string_eq_ignore_newline_repr_test() {
-<<<<<<< HEAD
     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"));
-=======
-    assert!(string_eq_ignore_newline_repr("a\nb\nc\rd", "a\nb\r\nc\rd"));
->>>>>>> c41b45169a6a8b461d6615fb59ade61182daf5f5
 }