Fix issue with windows line endings (#717).

The '\r' character wasn't counted in the line length.
rust-lang · Jan 10, 2016 · 598fcdd · 598fcdd
1 parent 66abad9
commit 598fcdd
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/lib.rs b/src/lib.rs
@@ -337,6 +337,7 @@ pub fn fmt_lines(file_map: &mut FileMap, config: &Config) -> FormatReport {
 
         for (c, b) in text.chars() {
             if c == '\r' {
+                line_len += c.len_utf8();
                 continue;
             }
 
@@ -367,7 +368,7 @@ pub fn fmt_lines(file_map: &mut FileMap, config: &Config) -> FormatReport {
                 last_wspace = None;
             } else {
                 newline_count = 0;
-                line_len += 1;
+                line_len += c.len_utf8();
                 if c.is_whitespace() {
                     if last_wspace.is_none() {
                         last_wspace = Some(b);