RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

Use .unwrap() and &byte for cleaner code.

Browse source 
(cherry picked from commit 0a91290d912d9193f707879bba5865e43b2094da)
This commit is contained in:
Dawid Ciężarkiewicz 2014-03-19 09:47:06 -07:00 • committed by Dawid Ciężarkiewicz
parent 893ab7c761
commit a93023372c
1 changed files with 16 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

50
cat/cat.rs
View file

@ -116,50 +116,34 @@ pub fn exec(files: ~[~str], number: NumberingMode, show_nonprint: bool, show_end
// EOF, rather than return Some(0) like a file. // EOF, rather than return Some(0) like a file.
match reader.read(buf) { match reader.read(buf) {
Ok(n) if n != 0 => { Ok(n) if n != 0 => {
for byte in buf.slice_to(n).iter() { for &byte in buf.slice_to(n).iter() {
if at_line_start && (number == NumberAll || (number == NumberNonEmpty && !is_newline_char(*byte))) { if at_line_start && (number == NumberAll || (number == NumberNonEmpty && !is_newline_char(byte))) {
match write!(&mut writer as &mut Writer, "{0:6u}\t", counter) { (write!(&mut writer as &mut Writer, "{0:6u}\t", counter)).unwrap();
Ok(_) => (), Err(err) => fail!("{}", err)
};
counter += 1; counter += 1;
at_line_start = false; at_line_start = false;
} }
if is_numbering && *byte == LF { if is_numbering && byte == LF {
at_line_start = true; at_line_start = true;
} }
if show_tabs && *byte == TAB { if show_tabs && byte == TAB {
match writer.write(bytes!("^I")) { writer.write(bytes!("^I")).unwrap();
Ok(_) => (), Err(err) => fail!("{}", err) } else if show_ends && byte == LF {
}; writer.write(bytes!("$\n")).unwrap();
} else if show_ends && *byte == LF { } else if show_nonprint && (byte < 32 || byte >= 127) && !is_newline_char(byte) {
match writer.write(bytes!("$\n")) { let mut byte = byte;
Ok(_) => (), Err(err) => fail!("{}", err)
};
} else if show_nonprint && (*byte < 32 || *byte >= 127) && !is_newline_char(*byte) {
let mut byte = *byte;
if byte >= 128 { if byte >= 128 {
match writer.write(bytes!("M-")) { writer.write(bytes!("M-")).unwrap();
Ok(_) => (), Err(err) => fail!("{}", err)
};
byte = byte - 128; byte = byte - 128;
} }
if byte < 32 { if byte < 32 {
match writer.write(['^' as u8, byte + 64]) { writer.write(['^' as u8, byte + 64]).unwrap();
Ok(_) => (), Err(err) => fail!("{}", err)
};
} else if byte == 127 { } else if byte == 127 {
match writer.write(['^' as u8, byte - 64]) { writer.write(['^' as u8, byte - 64]).unwrap();
Ok(_) => (), Err(err) => fail!("{}", err)
};
} else { } else {
match writer.write([byte]) { writer.write_u8(byte).unwrap();
Ok(_) => (), Err(err) => fail!("{}", err)
};
} }
} else { } else {
match writer.write([*byte]) { writer.write_u8(byte).unwrap();
Ok(_) => (), Err(err) => fail!("{}", err)
};
} }
} }
}, },
@ -184,9 +168,7 @@ pub fn exec(files: ~[~str], number: NumberingMode, show_nonprint: bool, show_end
// rather than return Some(0) like a file. // rather than return Some(0) like a file.
match reader.read(buf) { match reader.read(buf) {
Ok(n) if n != 0 => { Ok(n) if n != 0 => {
match writer.write(buf.slice_to(n)) { writer.write(buf.slice_to(n)).unwrap();
Ok(_) => (), Err(err) => fail!("{}", err)
}
}, _ => break }, _ => break
} }
} }