RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-08-02 22:17:45 +00:00
Code Issues Activity

Cleanup cat: use while let instead of loop then match.

Browse source
This commit is contained in:
Steven Allen 2015-01-24 22:53:27 -05:00
parent 9326dbc3de
commit 8a101b2203
1 changed files with 10 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/cat/cat.rs
View file

@ -101,11 +101,9 @@ fn write_lines(files: Vec<String>, number: NumberingMode, squeeze_blank: bool,
let mut out_buf = [0; 1024 * 64]; let mut out_buf = [0; 1024 * 64];
let mut writer = UnsafeWriter::new(out_buf.as_mut_slice(), stdout_raw()); let mut writer = UnsafeWriter::new(out_buf.as_mut_slice(), stdout_raw());
let mut at_line_start = true; let mut at_line_start = true;
loop { while let Ok(n) = reader.read(&mut in_buf) {
let n = match reader.read(&mut in_buf) { if n == 0 { break }
Ok(n) if n != 0 => n,
_ => break,
};
let in_buf = &in_buf[..n]; let in_buf = &in_buf[..n];
let mut buf_pos = range(0, n); let mut buf_pos = range(0, n);
loop { loop {
@ -173,11 +171,9 @@ fn write_bytes(files: Vec<String>, number: NumberingMode, squeeze_blank: bool,
let mut out_buf = [0; 1024 * 64]; let mut out_buf = [0; 1024 * 64];
let mut writer = UnsafeWriter::new(out_buf.as_mut_slice(), stdout_raw()); let mut writer = UnsafeWriter::new(out_buf.as_mut_slice(), stdout_raw());
let mut at_line_start = true; let mut at_line_start = true;
loop { while let Ok(n) = reader.read(&mut in_buf) {
let n = match reader.read(&mut in_buf) { if n == 0 { break }
Ok(n) if n != 0 => n,
_ => break,
};
for &byte in in_buf[..n].iter() { for &byte in in_buf[..n].iter() {
if flush_counter.next().is_none() { if flush_counter.next().is_none() {
writer.possibly_flush(); writer.possibly_flush();
@ -239,14 +235,10 @@ fn write_fast(files: Vec<String>) {
let mut in_buf = [0; 1024 * 64]; let mut in_buf = [0; 1024 * 64];
for (mut reader, _) in files.iter().filter_map(|p| open(&p[])) { for (mut reader, _) in files.iter().filter_map(|p| open(&p[])) {
loop { while let Ok(n) = reader.read(&mut in_buf) {
match reader.read(&mut in_buf) { if n == 0 { break }
Ok(n) if n != 0 => { // This interface is completely broken.
// This interface is completely broken. writer.write(&in_buf[..n]).unwrap();
writer.write(&in_buf[..n]).unwrap();
},
_ => break
}
} }
} }
} }