From 613ceec6309548a19ac6bc6fccf3540c61700ef4 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sat, 22 Mar 2014 21:20:22 -0700
Subject: [PATCH] Updates for upstream changes

---
 src/lib.rs       | 2 +-
 src/message.rs   | 6 +++---
 src/pool.rs      | 2 +-
 src/types/mod.rs | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index cb8431a9..eeb31e1b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -246,7 +246,7 @@ impl<'conn > Iterator<PostgresNotification> for PostgresNotifications<'conn> {
     /// `next` may return `Some` notification after returning `None` if a new
     /// notification was received.
     fn next(&mut self) -> Option<PostgresNotification> {
-        self.conn.conn.with_mut(|conn| { conn.notifications.pop_front() })
+        self.conn.conn.borrow_mut().notifications.pop_front()
     }
 }
 
diff --git a/src/message.rs b/src/message.rs
index 9ec07c21..5fe9c4be 100644
--- a/src/message.rs
+++ b/src/message.rs
@@ -263,7 +263,7 @@ impl<R: Reader> ReadMessage for R {
         let ident = try!(self.read_u8());
         // subtract size of length value
         let len = try!(self.read_be_i32()) as uint - mem::size_of::<i32>();
-        let mut buf = MemReader::new(try!(self.read_bytes(len)));
+        let mut buf = MemReader::new(try!(self.read_exact(len)));
 
         let ret = match ident as char {
             '1' => ParseComplete,
@@ -321,7 +321,7 @@ fn read_data_row(buf: &mut MemReader) -> IoResult<BackendMessage> {
     for _ in range(0, len) {
         let val = match try!(buf.read_be_i32()) {
             -1 => None,
-            len => Some(try!(buf.read_bytes(len as uint)))
+            len => Some(try!(buf.read_exact(len as uint)))
         };
         values.push(val);
     }
@@ -334,7 +334,7 @@ fn read_auth_message(buf: &mut MemReader) -> IoResult<BackendMessage> {
         0 => AuthenticationOk,
         2 => AuthenticationKerberosV5,
         3 => AuthenticationCleartextPassword,
-        5 => AuthenticationMD5Password { salt: try!(buf.read_bytes(4)) },
+        5 => AuthenticationMD5Password { salt: try!(buf.read_exact(4)) },
         6 => AuthenticationSCMCredential,
         7 => AuthenticationGSS,
         9 => AuthenticationSSPI,
diff --git a/src/pool.rs b/src/pool.rs
index c99c195a..0ff2b1f1 100644
--- a/src/pool.rs
+++ b/src/pool.rs
@@ -125,7 +125,7 @@ impl Drop for PooledPostgresConnection {
     fn drop(&mut self) {
         let conn = RefCell::new(self.conn.take());
         self.pool.pool.access(|pool| {
-            pool.pool.push(conn.with_mut(|r| r.take_unwrap()));
+            pool.pool.push(conn.borrow_mut().take_unwrap());
         })
     }
 }
diff --git a/src/types/mod.rs b/src/types/mod.rs
index 76e7470f..8f4ee83f 100644
--- a/src/types/mod.rs
+++ b/src/types/mod.rs
@@ -475,13 +475,13 @@ impl FromSql for Option<HashMap<~str, Option<~str>>> {
 
             for _ in range(0, count) {
                 let key_len = or_fail!(rdr.read_be_i32());
-                let key = str::from_utf8_owned(or_fail!(rdr.read_bytes(key_len as uint))).unwrap();
+                let key = str::from_utf8_owned(or_fail!(rdr.read_exact(key_len as uint))).unwrap();
 
                 let val_len = or_fail!(rdr.read_be_i32());
                 let val = if val_len < 0 {
                     None
                 } else {
-                    Some(str::from_utf8_owned(or_fail!(rdr.read_bytes(val_len as uint))).unwrap())
+                    Some(str::from_utf8_owned(or_fail!(rdr.read_exact(val_len as uint))).unwrap())
                 };
 
                 map.insert(key, val);