Test fixes and rebase conflicts

9 files changed, 20 insertions, 12 deletions

diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs
index 87d17cbc04f..6e81d14d73c 100644
--- a/src/librustc/middle/ty.rs
+++ b/src/librustc/middle/ty.rs
@@ -74,7 +74,6 @@ use std::fmt;
 use std::hash::{Hash, SipHasher, Hasher};
 use std::mem;
 use std::num::ToPrimitive;
-use std::num::wrapping::WrappingOps;
 use std::ops;
 use std::rc::Rc;
 use std::vec::IntoIter;
diff --git a/src/libstd/old_io/extensions.rs b/src/libstd/old_io/extensions.rs
index aec794af759..73973d0db28 100644
--- a/src/libstd/old_io/extensions.rs
+++ b/src/libstd/old_io/extensions.rs
@@ -519,7 +519,7 @@ mod bench {
         ({
             use super::u64_from_be_bytes;
 
-            let len = $stride.wrapping_mul(100).wrapping_add($start_index);
+            let len = ($stride as u8).wrapping_mul(100).wrapping_add($start_index);
             let data = (0..len).collect::<Vec<_>>();
             let mut sum = 0;
             $b.iter(|| {
diff --git a/src/libstd/sys/windows/fs.rs b/src/libstd/sys/windows/fs.rs
index f534a33d8cc..0bbb1a9e927 100644
--- a/src/libstd/sys/windows/fs.rs
+++ b/src/libstd/sys/windows/fs.rs
@@ -135,6 +135,13 @@ impl FileDesc {
             _ => Err(super::last_error()),
         }
     }
+
+    #[allow(dead_code)]
+    pub fn unwrap(self) -> fd_t {
+        let fd = self.fd;
+        unsafe { mem::forget(self) };
+        fd
+    }
 }
 
 impl Drop for FileDesc {
diff --git a/src/libstd/sys/windows/process.rs b/src/libstd/sys/windows/process.rs
index 414083bc41f..b10042090dd 100644
--- a/src/libstd/sys/windows/process.rs
+++ b/src/libstd/sys/windows/process.rs
@@ -487,9 +487,9 @@ mod tests {
     #[test]
     fn test_make_command_line() {
         fn test_wrapper(prog: &str, args: &[&str]) -> String {
-            make_command_line(&CString::new(prog),
+            make_command_line(&CString::new(prog).unwrap(),
                               &args.iter()
-                                   .map(|a| CString::new(a))
+                                   .map(|a| CString::new(*a).unwrap())
                                    .collect::<Vec<CString>>())
         }
 
diff --git a/src/libstd/sys/windows/process2.rs b/src/libstd/sys/windows/process2.rs
index 9e9bb86446e..7e832b6384d 100644
--- a/src/libstd/sys/windows/process2.rs
+++ b/src/libstd/sys/windows/process2.rs
@@ -445,10 +445,9 @@ mod tests {
         fn test_wrapper(prog: &str, args: &[&str]) -> String {
             String::from_utf16(
                 &make_command_line(OsStr::from_str(prog),
-                                   args.iter()
-                                       .map(|a| OsString::from_str(a))
-                                       .collect::<Vec<OsString>>()
-                                       .as_slice())).unwrap()
+                                   &args.iter()
+                                        .map(|a| OsString::from(a))
+                                        .collect::<Vec<OsString>>())).unwrap()
         }
 
         assert_eq!(
diff --git a/src/test/run-pass-fulldeps/create-dir-all-bare.rs b/src/test/run-pass-fulldeps/create-dir-all-bare.rs
index d09d7c55722..e4fb7c19909 100644
--- a/src/test/run-pass-fulldeps/create-dir-all-bare.rs
+++ b/src/test/run-pass-fulldeps/create-dir-all-bare.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-android
+
 #![feature(rustc_private)]
 
 extern crate rustc_back;
diff --git a/src/test/run-pass-fulldeps/rename-directory.rs b/src/test/run-pass-fulldeps/rename-directory.rs
index fa810f72fcb..a1e016bf2ea 100644
--- a/src/test/run-pass-fulldeps/rename-directory.rs
+++ b/src/test/run-pass-fulldeps/rename-directory.rs
@@ -11,6 +11,7 @@
 // This test can't be a unit test in std,
 // because it needs TempDir, which is in extra
 
+// ignore-android
 // pretty-expanded FIXME #23616
 
 #![feature(rustc_private, path_ext)]
diff --git a/src/test/run-pass/big-literals.rs b/src/test/run-pass/big-literals.rs
index ff13a1345d2..b73eac0c714 100644
--- a/src/test/run-pass/big-literals.rs
+++ b/src/test/run-pass/big-literals.rs
@@ -21,5 +21,5 @@ pub fn main() {
     assert_eq!(0xffffffffffffffff, (-1 as u64));
     assert_eq!(18446744073709551615, (-1 as u64));
 
-    assert_eq!((-2147483648).wrapping_sub(1), 2147483647);
+    assert_eq!((-2147483648i32).wrapping_sub(1), 2147483647);
 }
diff --git a/src/test/run-pass/tcp-stress.rs b/src/test/run-pass/tcp-stress.rs
index 489abf163c0..4209d5986ba 100644
--- a/src/test/run-pass/tcp-stress.rs
+++ b/src/test/run-pass/tcp-stress.rs
@@ -23,12 +23,12 @@ extern crate libc;
 use std::sync::mpsc::channel;
 use std::old_io::net::tcp::{TcpListener, TcpStream};
 use std::old_io::{Acceptor, Listener, Reader, Writer};
-use std::thread::{Builder, Thread};
+use std::thread::{self, Builder};
 use std::time::Duration;
 
 fn main() {
     // This test has a chance to time out, try to not let it time out
-    Thread::spawn(move|| -> () {
+    thread::spawn(move|| -> () {
         use std::old_io::timer;
         timer::sleep(Duration::milliseconds(30 * 1000));
         println!("timed out!");
@@ -36,7 +36,7 @@ fn main() {
     });
 
     let (tx, rx) = channel();
-    Thread::spawn(move || -> () {
+    thread::spawn(move || -> () {
         let mut listener = TcpListener::bind("127.0.0.1:0").unwrap();
         tx.send(listener.socket_name().unwrap()).unwrap();
         let mut acceptor = listener.listen();