Skip to content

Commit 2e90c43

Browse files
committed
Stop delaying Trailing whitespace error reporting
1 parent 42efae5 commit 2e90c43

File tree

1 file changed

+8
-14
lines changed

1 file changed

+8
-14
lines changed

src/lib.rs

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,6 @@ fn format_lines(
516516
config: &Config,
517517
report: &FormatReport,
518518
) {
519-
let mut trims = vec![];
520519
let mut last_was_space = false;
521520
let mut line_len = 0;
522521
let mut cur_line = 1;
@@ -565,8 +564,15 @@ fn format_lines(
565564
// Check for (and record) trailing whitespace.
566565
if last_was_space {
567566
if should_report_error(config, kind, is_string, &ErrorKind::TrailingWhitespace)
567+
&& !is_skipped_line(cur_line, skipped_range)
568568
{
569-
trims.push((cur_line, kind, line_buffer.clone()));
569+
errors.push(FormattingError {
570+
line: cur_line,
571+
kind: ErrorKind::TrailingWhitespace,
572+
is_comment: kind.is_comment(),
573+
is_string: kind.is_string(),
574+
line_buffer: line_buffer.clone(),
575+
});
570576
}
571577
line_len -= 1;
572578
}
@@ -611,18 +617,6 @@ fn format_lines(
611617
text.truncate(line);
612618
}
613619

614-
for &(l, kind, ref b) in &trims {
615-
if !is_skipped_line(l, skipped_range) {
616-
errors.push(FormattingError {
617-
line: l,
618-
kind: ErrorKind::TrailingWhitespace,
619-
is_comment: kind.is_comment(),
620-
is_string: kind.is_string(),
621-
line_buffer: b.clone(),
622-
});
623-
}
624-
}
625-
626620
report.append(name.clone(), errors);
627621
}
628622

0 commit comments

Comments
 (0)