From 225de0d60f8ca8dcc62ab2fd8818ebbda4b58cfe Mon Sep 17 00:00:00 2001 From: Nick Cameron Date: Tue, 18 Nov 2014 13:49:09 +1300 Subject: [PATCH] Windows and OS X fallout --- src/libstd/os.rs | 10 +++++----- src/libstd/rand/os.rs | 4 ++-- src/libstd/rt/backtrace.rs | 2 +- src/libstd/sys/windows/fs.rs | 2 +- src/libstd/sys/windows/os.rs | 2 +- src/libstd/sys/windows/pipe.rs | 8 ++++---- src/libstd/sys/windows/process.rs | 10 +++++----- src/test/run-pass/tcp-stress.rs | 6 +++--- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/libstd/os.rs b/src/libstd/os.rs index f5aa2259f8d9c..acb0a72137048 100644 --- a/src/libstd/os.rs +++ b/src/libstd/os.rs @@ -140,7 +140,7 @@ pub fn getcwd() -> Path { panic!(); } } - Path::new(String::from_utf16(::str::truncate_utf16_at_nul(buf)) + Path::new(String::from_utf16(::str::truncate_utf16_at_nul(&buf)) .expect("GetCurrentDirectoryW returned invalid UTF-16")) } @@ -2065,12 +2065,12 @@ mod tests { join_paths(input).unwrap().as_slice() == output.as_bytes() } - assert!(test_eq([], "")); - assert!(test_eq([r"c:\windows", r"c:\"], + assert!(test_eq(&[], "")); + assert!(test_eq(&[r"c:\windows", r"c:\"], r"c:\windows;c:\")); - assert!(test_eq(["", r"c:\windows", "", "", r"c:\", ""], + assert!(test_eq(&["", r"c:\windows", "", "", r"c:\", ""], r";c:\windows;;;c:\;")); - assert!(test_eq([r"c:\te;st", r"c:\"], + assert!(test_eq(&[r"c:\te;st", r"c:\"], r#""c:\te;st";c:\"#)); assert!(join_paths(&[r#"c:\te"st"#]).is_err()); } diff --git a/src/libstd/rand/os.rs b/src/libstd/rand/os.rs index 92cfc859cd0f2..43a79770fbb84 100644 --- a/src/libstd/rand/os.rs +++ b/src/libstd/rand/os.rs @@ -298,12 +298,12 @@ mod imp { impl Rng for OsRng { fn next_u32(&mut self) -> u32 { let mut v = [0u8, .. 4]; - self.fill_bytes(v); + self.fill_bytes(&mut v); unsafe { mem::transmute(v) } } fn next_u64(&mut self) -> u64 { let mut v = [0u8, .. 8]; - self.fill_bytes(v); + self.fill_bytes(&mut v); unsafe { mem::transmute(v) } } fn fill_bytes(&mut self, v: &mut [u8]) { diff --git a/src/libstd/rt/backtrace.rs b/src/libstd/rt/backtrace.rs index 0f888bd222c27..ea43111b2b2f7 100644 --- a/src/libstd/rt/backtrace.rs +++ b/src/libstd/rt/backtrace.rs @@ -999,7 +999,7 @@ mod imp { None => try!(w.write(bytes[..bytes.len()-1])), } } - try!(w.write(['\n' as u8])); + try!(w.write(&['\n' as u8])); } Ok(()) diff --git a/src/libstd/sys/windows/fs.rs b/src/libstd/sys/windows/fs.rs index a07688b2fed03..b881eb2d4955c 100644 --- a/src/libstd/sys/windows/fs.rs +++ b/src/libstd/sys/windows/fs.rs @@ -263,7 +263,7 @@ pub fn readdir(p: &Path) -> IoResult> { let mut more_files = 1 as libc::BOOL; while more_files != 0 { { - let filename = str::truncate_utf16_at_nul(wfd.cFileName); + let filename = str::truncate_utf16_at_nul(&wfd.cFileName); match String::from_utf16(filename) { Some(filename) => paths.push(Path::new(filename)), None => { diff --git a/src/libstd/sys/windows/os.rs b/src/libstd/sys/windows/os.rs index aaa1aaf632794..aa43b42e74643 100644 --- a/src/libstd/sys/windows/os.rs +++ b/src/libstd/sys/windows/os.rs @@ -76,7 +76,7 @@ pub fn error_string(errnum: i32) -> String { return format!("OS Error {} (FormatMessageW() returned error {})", errnum, fm_err); } - let msg = String::from_utf16(::str::truncate_utf16_at_nul(buf)); + let msg = String::from_utf16(::str::truncate_utf16_at_nul(&buf)); match msg { Some(msg) => format!("OS Error {}: {}", errnum, msg), None => format!("OS Error {} (FormatMessageW() returned invalid UTF-16)", errnum), diff --git a/src/libstd/sys/windows/pipe.rs b/src/libstd/sys/windows/pipe.rs index f2f7994a0057c..e38202302fb0e 100644 --- a/src/libstd/sys/windows/pipe.rs +++ b/src/libstd/sys/windows/pipe.rs @@ -395,7 +395,7 @@ impl UnixStream { loop { // Process a timeout if one is pending let wait_succeeded = await(self.handle(), self.read_deadline, - [overlapped.hEvent]); + &[overlapped.hEvent]); let ret = unsafe { libc::GetOverlappedResult(self.handle(), @@ -459,7 +459,7 @@ impl UnixStream { } // Process a timeout if one is pending let wait_succeeded = await(self.handle(), self.write_deadline, - [overlapped.hEvent]); + &[overlapped.hEvent]); let ret = unsafe { libc::GetOverlappedResult(self.handle(), &mut overlapped, @@ -660,8 +660,8 @@ impl UnixAcceptor { if err == libc::ERROR_IO_PENDING as libc::DWORD { // Process a timeout if one is pending let wait_succeeded = await(handle, self.deadline, - [self.inner.abort.handle(), - overlapped.hEvent]); + &[self.inner.abort.handle(), + overlapped.hEvent]); // This will block until the overlapped I/O is completed. The // timeout was previously handled, so this will either block in diff --git a/src/libstd/sys/windows/process.rs b/src/libstd/sys/windows/process.rs index 67e87841ed24d..3fb5ee34356fe 100644 --- a/src/libstd/sys/windows/process.rs +++ b/src/libstd/sys/windows/process.rs @@ -487,24 +487,24 @@ mod tests { } assert_eq!( - test_wrapper("prog", ["aaa", "bbb", "ccc"]), + test_wrapper("prog", &["aaa", "bbb", "ccc"]), "prog aaa bbb ccc".to_string() ); assert_eq!( - test_wrapper("C:\\Program Files\\blah\\blah.exe", ["aaa"]), + test_wrapper("C:\\Program Files\\blah\\blah.exe", &["aaa"]), "\"C:\\Program Files\\blah\\blah.exe\" aaa".to_string() ); assert_eq!( - test_wrapper("C:\\Program Files\\test", ["aa\"bb"]), + test_wrapper("C:\\Program Files\\test", &["aa\"bb"]), "\"C:\\Program Files\\test\" aa\\\"bb".to_string() ); assert_eq!( - test_wrapper("echo", ["a b c"]), + test_wrapper("echo", &["a b c"]), "echo \"a b c\"".to_string() ); assert_eq!( - test_wrapper("\u03c0\u042f\u97f3\u00e6\u221e", []), + test_wrapper("\u03c0\u042f\u97f3\u00e6\u221e", &[]), "\u03c0\u042f\u97f3\u00e6\u221e".to_string() ); } diff --git a/src/test/run-pass/tcp-stress.rs b/src/test/run-pass/tcp-stress.rs index 676f7e91857f0..34fbe1c9a956b 100644 --- a/src/test/run-pass/tcp-stress.rs +++ b/src/test/run-pass/tcp-stress.rs @@ -45,7 +45,7 @@ fn main() { } }; stream.read_byte(); - stream.write([2]); + stream.write(&[2]); } }); let addr = rx.recv(); @@ -57,9 +57,9 @@ fn main() { match TcpStream::connect(addr) { Ok(stream) => { let mut stream = stream; - stream.write([1]); + stream.write(&[1]); let mut buf = [0]; - stream.read(buf); + stream.read(&mut buf); }, Err(e) => debug!("{}", e) }