Clean up string creation

Author: sfackler

src/lib.rs

@@ -90,7 +90,6 @@ use std::io::net::ip::{Port, SocketAddr};
 use std::io::net::tcp::TcpStream;
 use std::io::net::unix::UnixStream;
 use std::mem;
-use std::str;
 use std::task;
 use std::fmt;
 
@@ -809,11 +808,11 @@ impl InnerPostgresConnection {
         loop {
             match try_pg!(self.read_message()) {
                 ReadyForQuery { .. } => break,
-                DataRow { row } =>
-                    // FIXME
-                    result.push(row.move_iter().map(|opt|
-                            opt.map(|b| str::from_utf8(b.as_slice()).unwrap().to_owned()))
-                               .collect()),
+                DataRow { row } => {
+                    result.push(row.move_iter().map(|opt| {
+                            opt.map(|b| StrBuf::from_utf8(b).unwrap().into_owned())
+                        }).collect());
+                }
                 ErrorResponse { fields } => {
                     try!(self.wait_for_ready());
                     return Err(PgDbError(PostgresDbError::new(fields)));

src/message.rs

@@ -1,4 +1,3 @@
-use std::str;
 use std::io::{IoResult, MemWriter, MemReader};
 use std::mem;
 
@@ -245,8 +244,7 @@ impl<R: Buffer> ReadCStr for R {
     fn read_cstr(&mut self) -> IoResult<~str> {
         let mut buf = try!(self.read_until(0));
         buf.pop();
-        // FIXME
-        Ok(str::from_utf8(buf.as_slice()).unwrap().to_owned())
+        Ok(StrBuf::from_utf8(buf).unwrap().into_owned())
     }
 }
 

src/types/mod.rs

@@ -7,7 +7,6 @@ use serialize::json;
 use serialize::json::Json;
 use std::io::{MemWriter, BufReader};
 use std::io::util::LimitReader;
-use std::str;
 use time::Timespec;
 
 use error::{PostgresError, PgWrongType, PgStreamError, PgWasNull};
@@ -267,8 +266,7 @@ impl RawFromSql for Vec<u8> {
 impl RawFromSql for ~str {
     fn raw_from_sql<R: Reader>(raw: &mut R)
             -> Result<~str, PostgresError> {
-        // FIXME
-        Ok(str::from_utf8(try_pg!(raw.read_to_end()).as_slice()).unwrap().to_owned())
+        Ok(StrBuf::from_utf8(try_pg!(raw.read_to_end())).unwrap().into_owned())
     }
 }
 
@@ -483,15 +481,15 @@ impl FromSql for Option<HashMap<~str, Option<~str>>> {
 
                 for _ in range(0, count) {
                     let key_len = try_pg!(rdr.read_be_i32());
-                    let key = str::from_utf8(try_pg!(rdr.read_exact(key_len as uint)).as_slice())
-                        .unwrap().to_owned();
+                    let key = try_pg!(rdr.read_exact(key_len as uint));
+                    let key = StrBuf::from_utf8(key).unwrap().into_owned();
 
                     let val_len = try_pg!(rdr.read_be_i32());
                     let val = if val_len < 0 {
                         None
                     } else {
-                        Some(str::from_utf8(try_pg!(rdr.read_exact(val_len as uint)).as_slice())
-                             .unwrap().to_owned())
+                        let val = try_pg!(rdr.read_exact(val_len as uint));
+                        Some(StrBuf::from_utf8(val).unwrap().into_owned())
                     };
 
                     map.insert(key, val);