Update to rust master

3 files changed, 4 insertions, 5 deletions

diff --git a/src/channel.rs b/src/channel.rs
index 45249d0..6f951f2 100644
--- a/src/channel.rs
+++ b/src/channel.rs
@@ -1,7 +1,6 @@
 use std::cmp;
 use std::io;
 use std::kinds::marker;
-use std::vec;
 use libc::{c_uint, c_int, size_t, c_char, c_void, c_uchar};
 
 use {raw, Session, Error};
@@ -249,7 +248,7 @@ impl<'a> Channel<'a> {
         unsafe fn convert(chan: &Channel, ptr: *mut c_char,
                           len: size_t) -> Option<String> {
             if ptr.is_null() { return None }
-            let ret = vec::raw::from_buf(ptr as *const u8, len as uint);
+            let ret = Vec::from_raw_buf(ptr as *const u8, len as uint);
             raw::libssh2_free(chan.sess.raw(), ptr as *mut c_void);
             String::from_utf8(ret).ok()
         }
diff --git a/src/error.rs b/src/error.rs
index baf82a5..f8938db 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -22,7 +22,7 @@ impl Error {
             let rc = raw::libssh2_session_last_error(sess.raw(), &mut msg,
                                                      0 as *mut _, 0);
             if rc == 0 { return None }
-            Some(Error::new(rc, str::raw::c_str_to_static_slice(msg as *const _)))
+            Some(Error::new(rc, str::from_c_str(msg as *const _)))
         }
     }
 
diff --git a/src/session.rs b/src/session.rs
index 18d5a23..0fcee0c 100644
--- a/src/session.rs
+++ b/src/session.rs
@@ -224,7 +224,7 @@ impl Session {
                                                          &mut ptr);
             if rc <= 0 { try!(self.rc(rc)) }
             for i in range(0, rc as int) {
-                ret.push(str::raw::c_str_to_static_slice(*ptr.offset(i)));
+                ret.push(str::from_c_str(*ptr.offset(i)));
             }
             raw::libssh2_free(self.raw, ptr as *mut c_void);
         }
@@ -441,7 +441,7 @@ impl Session {
             if ret.is_null() {
                 Err(Error::last_error(self).unwrap())
             } else {
-                Ok(str::raw::c_str_to_static_slice(ret))
+                Ok(str::from_c_str(ret))
             }
         }
     }