From 25d2671c5569e0b1cf833e1b53b53c338281928a Mon Sep 17 00:00:00 2001 From: Shohei Wada Date: Thu, 5 Oct 2017 00:23:17 +0900 Subject: [PATCH] Fix broken tests under CRLF env. --- src/items.rs | 6 +++--- src/lists.rs | 4 ++-- src/utils.rs | 4 ++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/items.rs b/src/items.rs index 8fdfdb4110c..a1e5fe4abda 100644 --- a/src/items.rs +++ b/src/items.rs @@ -31,8 +31,8 @@ use utils::{colon_spaces, contains_skip, end_typaram, first_line_width, format_abi, format_constness, format_defaultness, format_mutability, format_unsafety, format_visibility, is_attributes_extendable, last_line_contains_single_line_comment, - last_line_used_width, last_line_width, mk_sp, semicolon_for_expr, stmt_expr, - trim_newlines, trimmed_last_line_width}; + last_line_used_width, last_line_width, mk_sp, semicolon_for_expr, starts_with_newline, + stmt_expr, trim_newlines, trimmed_last_line_width}; use vertical::rewrite_with_alignment; use visitor::FmtVisitor; @@ -1940,7 +1940,7 @@ fn rewrite_fn_base( // Try to preserve the layout of the original snippet. let original_starts_with_newline = snippet .find(|c| c != ' ') - .map_or(false, |i| snippet[i..].starts_with('\n')); + .map_or(false, |i| starts_with_newline(&snippet[i..])); let original_ends_with_newline = snippet .rfind(|c| c != ' ') .map_or(false, |i| snippet[i..].ends_with('\n')); diff --git a/src/lists.rs b/src/lists.rs index e499377e48a..a26165d48a0 100644 --- a/src/lists.rs +++ b/src/lists.rs @@ -17,7 +17,7 @@ use config::{Config, IndentStyle}; use rewrite::RewriteContext; use shape::{Indent, Shape}; -use utils::{first_line_width, last_line_width, mk_sp}; +use utils::{first_line_width, last_line_width, mk_sp, starts_with_newline}; /// Formatting tactic for lists. This will be cast down to a /// `DefinitiveListTactic` depending on the number and length of the items and @@ -425,7 +425,7 @@ pub fn write_list(items: I, formatting: &ListFormatting) -> Option let mut formatted_comment = try_opt!(rewrite_post_comment(&mut item_max_width)); - if !formatted_comment.starts_with('\n') { + if !starts_with_newline(&formatted_comment) { let mut comment_alignment = post_comment_alignment(item_max_width, inner_item.len()); if first_line_width(&formatted_comment) + last_line_width(&result) diff --git a/src/utils.rs b/src/utils.rs index 3c97044f5c4..02c677704ef 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -493,3 +493,7 @@ pub fn isatty() -> bool { kernel32::GetConsoleMode(handle, &mut out) != 0 } } + +pub fn starts_with_newline(s: &str) -> bool { + s.starts_with('\n') || s.starts_with("\r\n") +}