RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 12:07:46 +00:00
Code Issues Activity

refactor ~ change repair of 'fix cargo clippy complaints (fatal/same if clause)'

Browse source 
.# [why]

The initial refactoring/repair led to comments within if conditions which is
objectionable to some of the devs. So, this changes the refactor to completely split
the if clauses into separate if statements (with corresponding commentary).

Note: this refactor is "less mechanical" and does increase the risk of changing the
actual effect of the code. But the change is small and the tests are passing.
This commit is contained in:
Roy Ivy III 2020-04-07 12:37:14 -05:00
parent 156502a332
commit ecb8f2873a
1 changed files with 31 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/fmt/parasplit.rs
View file

@ -165,19 +165,23 @@ impl<'a> Iterator for FileLines<'a> {
return Some(Line::NoFormatLine("".to_owned(), true)); return Some(Line::NoFormatLine("".to_owned(), true));
} }
let (pmatch, poffset) = self.match_prefix(&n[..]);
// if this line does not match the prefix, // if this line does not match the prefix,
// emit the line unprocessed and iterate again // emit the line unprocessed and iterate again
let (pmatch, poffset) = self.match_prefix(&n[..]); if !pmatch {
if !pmatch return Some(Line::NoFormatLine(n, false));
|| }
// if the line matches the prefix, but is blank after,
// don't allow lines to be combined through it (that is, // if the line matches the prefix, but is blank after,
// treat it like a blank line, except that since it's // don't allow lines to be combined through it (that is,
// not truly blank we will not allow mail headers on the // treat it like a blank line, except that since it's
// following line) // not truly blank we will not allow mail headers on the
n[poffset + self.opts.prefix.len()..] // following line)
.chars() if pmatch
.all(char::is_whitespace) && n[poffset + self.opts.prefix.len()..]
.chars()
.all(char::is_whitespace)
{ {
return Some(Line::NoFormatLine(n, false)); return Some(Line::NoFormatLine(n, false));
} }
@ -360,21 +364,26 @@ impl<'a> Iterator for ParagraphStream<'a> {
} }
} else if !second_done { } else if !second_done {
// now we have enough info to handle crown margin and tagged mode // now we have enough info to handle crown margin and tagged mode
if
// in both crown and tagged modes we require that prefix_len is the same // in both crown and tagged modes we require that prefix_len is the same
prefix_len != fl.prefix_len || pfxind_end != fl.pfxind_end if prefix_len != fl.prefix_len || pfxind_end != fl.pfxind_end {
|| break;
// in tagged mode, indent has to be *different* on following lines }
self.opts.tagged && indent_len - 4 == fl.indent_len && indent_end == fl.indent_end
// in tagged mode, indent has to be *different* on following lines
if self.opts.tagged
&& indent_len - 4 == fl.indent_len
&& indent_end == fl.indent_end
{ {
break; break;
} else {
// this is part of the same paragraph, get the indent info from this line
indent_str.clear();
indent_str.push_str(&fl.line[..fl.indent_end]);
indent_len = fl.indent_len;
indent_end = fl.indent_end;
} }
// this is part of the same paragraph, get the indent info from this line
indent_str.clear();
indent_str.push_str(&fl.line[..fl.indent_end]);
indent_len = fl.indent_len;
indent_end = fl.indent_end;
second_done = true; second_done = true;
} else { } else {
// detect mismatch // detect mismatch