std: cleanups, post-rebase

src/libstd/net_tcp.rs

@@ -6,6 +6,7 @@ import ip = net_ip;
 import uv::iotask;
 import uv::iotask::iotask;
 import comm::methods;
+import future::future;
 import future_spawn = future::spawn;
 // FIXME #1935
 // should be able to, but can't atm, replace w/ result::{result, extensions};

src/libstd/uv_ll.rs

@@ -770,7 +770,7 @@ unsafe fn ip6_addr(ip: str, port: int)
 -> sockaddr_in6 {
     str::as_c_str(ip) {|ip_buf|
         rustrt::rust_uv_ip6_addr(ip_buf as *u8,
-                                 port as libc::c_int);
+                                 port as libc::c_int)
     }
 }
 unsafe fn ip4_name(src: &sockaddr_in) -> str {