From 99daec602fc8fa4612320c7c1babe6ae8717759c Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Tue, 7 May 2013 11:38:08 -0700
Subject: librustc: Fix merge fallout.

---
 src/libstd/future.rs  |  7 +++++++
 src/libstd/net_tcp.rs | 18 ++++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

(limited to 'src/libstd')

diff --git a/src/libstd/future.rs b/src/libstd/future.rs
index 209859e3096..eea9d56c975 100644
--- a/src/libstd/future.rs
+++ b/src/libstd/future.rs
@@ -28,6 +28,13 @@ use core::pipes::recv;
 use core::task;
 
 #[doc = "The future type"]
+#[cfg(stage0)]
+pub struct Future<A> {
+    priv mut state: FutureState<A>,
+}
+
+#[doc = "The future type"]
+#[cfg(not(stage0))]
 pub struct Future<A> {
     priv state: FutureState<A>,
 }
diff --git a/src/libstd/net_tcp.rs b/src/libstd/net_tcp.rs
index e8c38be74c7..560e91f13a7 100644
--- a/src/libstd/net_tcp.rs
+++ b/src/libstd/net_tcp.rs
@@ -902,8 +902,10 @@ impl io::Reader for TcpSocketBuf {
           // need to read in data from the socket. Note that the internal
           // buffer is of no use anymore as we read all bytes from it,
           // so we can throw it away.
-          let data = &*self.data;
-          let read_result = read(&data.sock, 0u);
+          let read_result = {
+            let data = &*self.data;
+            read(&data.sock, 0)
+          };
           if read_result.is_err() {
               let err_data = read_result.get_err();
 
@@ -918,8 +920,7 @@ impl io::Reader for TcpSocketBuf {
                   // should show up in a later call to read().
                   break;
               }
-          }
-          else {
+          } else {
               self.data.buf = result::unwrap(read_result);
               self.data.buf_off = 0;
           }
@@ -935,8 +936,10 @@ impl io::Reader for TcpSocketBuf {
             return c as int
           }
 
-          let data = &*self.data;
-          let read_result = read(&data.sock, 0u);
+          let read_result = {
+            let data = &*self.data;
+            read(&data.sock, 0)
+          };
           if read_result.is_err() {
               let err_data = read_result.get_err();
 
@@ -948,8 +951,7 @@ impl io::Reader for TcpSocketBuf {
                          err_data.err_name, err_data.err_msg);
                   fail!()
               }
-          }
-          else {
+          } else {
               self.data.buf = result::unwrap(read_result);
               self.data.buf_off = 0;
           }
-- 
cgit 1.4.1-3-g733a5