Skip to content

Commit 42efae5

Browse files
committed
Clean Up code where last whitspace tracking isn't used
1 parent 34067a1 commit 42efae5

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

src/lib.rs

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ fn format_lines(
517517
report: &FormatReport,
518518
) {
519519
let mut trims = vec![];
520-
let mut last_wspace: Option<usize> = None;
520+
let mut last_was_space = false;
521521
let mut line_len = 0;
522522
let mut cur_line = 1;
523523
let mut newline_count = 0;
@@ -542,7 +542,7 @@ fn format_lines(
542542
}
543543

544544
// Iterate over the chars in the file map.
545-
for (kind, (b, c)) in CharClasses::new(text.chars().enumerate()) {
545+
for (kind, c) in CharClasses::new(text.chars()) {
546546
if c == '\r' {
547547
continue;
548548
}
@@ -563,7 +563,7 @@ fn format_lines(
563563
if c == '\n' {
564564
if format_line {
565565
// Check for (and record) trailing whitespace.
566-
if let Some(..) = last_wspace {
566+
if last_was_space {
567567
if should_report_error(config, kind, is_string, &ErrorKind::TrailingWhitespace)
568568
{
569569
trims.push((cur_line, kind, line_buffer.clone()));
@@ -591,19 +591,13 @@ fn format_lines(
591591
cur_line += 1;
592592
format_line = config.file_lines().contains_line(name, cur_line);
593593
newline_count += 1;
594-
last_wspace = None;
594+
last_was_space = false;
595595
line_buffer.clear();
596596
is_string = false;
597597
} else {
598598
newline_count = 0;
599599
line_len += if c == '\t' { config.tab_spaces() } else { 1 };
600-
if c.is_whitespace() {
601-
if last_wspace.is_none() {
602-
last_wspace = Some(b);
603-
}
604-
} else {
605-
last_wspace = None;
606-
}
600+
last_was_space = c.is_whitespace();
607601
line_buffer.push(c);
608602
if kind.is_string() {
609603
is_string = true;

0 commit comments

Comments
 (0)