From a696193bab3f09e7c95173e10d1e98d18b8f1bb8 Mon Sep 17 00:00:00 2001
From: Jeff Olson <olson.jeffery@gmail.com>
Date: Wed, 27 Jun 2012 15:45:46 -0700
Subject: [PATCH] std: cleanups, post-rebase

---
 src/libstd/net_tcp.rs | 1 +
 src/libstd/uv_ll.rs   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libstd/net_tcp.rs b/src/libstd/net_tcp.rs
index feec985b236..76d5ccd3fcc 100644
--- a/src/libstd/net_tcp.rs
+++ b/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};
diff --git a/src/libstd/uv_ll.rs b/src/libstd/uv_ll.rs
index 0d6043be36b..a58ffca1dd1 100644
--- a/src/libstd/uv_ll.rs
+++ b/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 {