RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-27 19:17:43 +00:00
Code Issues Activity

Merge pull request #77 from Arcterus/master

Browse source 
Update most utilities for latest Rust
This commit is contained in:
Heather 2014-02-06 08:14:14 +03:00
commit e4fa660d35
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mkdir/mkdir.rs
View file

@ -33,7 +33,7 @@ fn main() {
groups::optflag("v", "verbose",
"print a message for each printed directory"),
groups::optflag("h", "help", "display this help"),
groups::optflag("", "version", "display this version")
groups::optflag("V", "version", "display this version")
];
let matches = match groups::getopts(args.tail(), opts) {

8
wc/wc.rs
View file

@ -12,8 +12,8 @@
extern mod extra;
use std::os;
use std::io::{print, stdin, stderr, File, result, BufferedReader};
use std::str::from_utf8;
use std::io::{print, stdin, stderr, File, BufferedReader};
use extra::getopts::{groups, Matches};
struct Result {
@ -108,8 +108,8 @@ pub fn wc(files: ~[~str], matches: &Matches) {
loop {
// reading from a TTY seems to raise a condition on, rather than return Some(0) like a file.
// hence the option wrapped in a result here
match result(| | reader.read_until(LF)) {
Ok(Some(raw_line)) => {
match reader.read_until(LF) {
Ok(raw_line) => {
// GNU 'wc' only counts lines that end in LF as lines
if raw_line.iter().last().unwrap() == &LF {
line_count += 1;
@ -223,7 +223,7 @@ fn open(path: ~str) -> Option<BufferedReader<~Reader>> {
return Some(BufferedReader::new(reader));
}
match result(|| File::open(&std::path::Path::new(path.as_slice()))) {
match File::open(&std::path::Path::new(path.as_slice())) {
Ok(fd) => {
let reader = ~fd as ~Reader;
return Some(BufferedReader::new(reader));