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

uniq: minor refactoring in skip_fields

Browse source
This commit is contained in:
Chirag B. Jadwani 2016-02-29 11:16:58 +05:30
parent fc5b798ff1
commit d674a3bb63
1 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/uniq/uniq.rs
View file

@ -44,7 +44,7 @@ impl Uniq {
for io_line in reader.lines() { for io_line in reader.lines() {
let line = crash_if_err!(1, io_line); let line = crash_if_err!(1, io_line);
if !lines.is_empty() && self.cmp_key(&self.skip_fields(&lines[0])) != self.cmp_key(&self.skip_fields(&line)) { if !lines.is_empty() && self.cmp_key(&lines[0]) != self.cmp_key(&line) {
let print_delimiter = delimiters == "prepend" || (delimiters == "separate" && first_line_printed); let print_delimiter = delimiters == "prepend" || (delimiters == "separate" && first_line_printed);
first_line_printed |= self.print_lines(writer, &lines, print_delimiter); first_line_printed |= self.print_lines(writer, &lines, print_delimiter);
lines.truncate(0); lines.truncate(0);
@ -58,32 +58,33 @@ impl Uniq {
} }
fn skip_fields(&self, line: &str) -> String { fn skip_fields(&self, line: &str) -> String {
match self.skip_fields { if let Some(skip_fields) = self.skip_fields {
Some(skip_fields) => if line.split_whitespace().count() > skip_fields {
if line.split_whitespace().count() > skip_fields { let mut field = 0;
let mut field = 0; let mut i = 0;
let mut i = 0; while field < skip_fields && i < line.len() {
while field < skip_fields && i < line.len() { while i < line.len() && line.chars().nth(i).unwrap().is_whitespace() {
while i < line.len() && line.chars().nth(i).unwrap().is_whitespace() { i = i + 1;
i = i + 1;
}
while i < line.len() && !line.chars().nth(i).unwrap().is_whitespace() {
i = i + 1;
}
field = field + 1;
} }
line[i..].to_owned() while i < line.len() && !line.chars().nth(i).unwrap().is_whitespace() {
} else { i = i + 1;
"".to_owned() }
}, field = field + 1;
None => line[..].to_owned() }
line[i..].to_owned()
} else {
"".to_owned()
}
} else {
line[..].to_owned()
} }
} }
fn cmp_key(&self, line: &str) -> String { fn cmp_key(&self, line: &str) -> String {
let len = line.len(); let fields_to_check = &self.skip_fields(line);
let len = fields_to_check.len();
if len > 0 { if len > 0 {
line.chars() fields_to_check.chars()
.skip(self.slice_start.unwrap_or(0)) .skip(self.slice_start.unwrap_or(0))
.take(self.slice_stop.unwrap_or(len)) .take(self.slice_stop.unwrap_or(len))
.map(|c| match c { .map(|c| match c {
@ -91,7 +92,7 @@ impl Uniq {
_ => c, _ => c,
}).collect() }).collect()
} else { } else {
line.to_owned() fields_to_check.to_owned()
} }
} }