diff --git a/hostname/hostname.rs b/hostname/hostname.rs index d5c99bb2a..60e975d6b 100644 --- a/hostname/hostname.rs +++ b/hostname/hostname.rs @@ -96,7 +96,7 @@ fn xgethostname() -> ~str { } fn xsethostname(name: &~str) { - let vec_name: ~[libc::c_char] = name.bytes().map(|c| c as i8).collect(); + let vec_name: Vec = name.bytes().map(|c| c as i8).collect(); let err = unsafe { sethostname (vec_name.as_ptr(), vec_name.len() as i32) diff --git a/paste/paste.rs b/paste/paste.rs index 164ff6133..2f72013f0 100644 --- a/paste/paste.rs +++ b/paste/paste.rs @@ -57,7 +57,7 @@ fn main() { } fn paste(filenames: Vec<~str>, serial: bool, delimiters: ~str) { - let mut files: ~[io::BufferedReader>] = filenames.move_iter().map(|name| + let mut files: Vec>> = filenames.move_iter().map(|name| io::BufferedReader::new( if name == "-".to_owned() { box io::stdio::stdin_raw() as Box @@ -66,14 +66,14 @@ fn paste(filenames: Vec<~str>, serial: bool, delimiters: ~str) { } ) ).collect(); - let delimiters: ~[~str] = delimiters.chars().map(|x| x.to_str()).collect(); + let delimiters: Vec<~str> = delimiters.chars().map(|x| x.to_str()).collect(); let mut delim_count = 0; if serial { for file in files.mut_iter() { let mut output = "".to_owned(); loop { output = output + match file.read_line() { - Ok(line) => line.trim_right() + delimiters[delim_count % delimiters.len()], + Ok(line) => line.trim_right() + delimiters.get(delim_count % delimiters.len()).clone(), Err(f) => if f.kind == io::EndOfFile { break } else { @@ -103,7 +103,7 @@ fn paste(filenames: Vec<~str>, serial: bool, delimiters: ~str) { } } } - output = output + delimiters[delim_count % delimiters.len()]; + output = output + delimiters.get(delim_count % delimiters.len()).clone(); delim_count += 1; } if files.len() == eof_count { diff --git a/tac/tac.rs b/tac/tac.rs index 37187dbfe..22e1abe96 100644 --- a/tac/tac.rs +++ b/tac/tac.rs @@ -86,7 +86,7 @@ fn tac(filenames: Vec<~str>, before: bool, _: bool, separator: ~str) { buf.truncate(len - 1); data = buf.into_owned(); } - let split_vec: ~[&str] = data.split_str(separator).collect(); + let split_vec: Vec<&str> = data.split_str(separator).collect(); let rev: ~str = split_vec.iter().rev().fold("".to_owned(), |a, &b| a + if before { separator + b