Update to rust master

Author: alexcrichton

src/error.rs

@@ -30,7 +30,7 @@ impl Error {
         ::init();
         Error {
             raw: raw::git_error {
-                message: unsafe { s.to_c_str().unwrap() as *mut _ },
+                message: unsafe { s.to_c_str().into_inner() as *mut _ },
                 klass: raw::GIT_ERROR as libc::c_int,
             }
         }

src/lib.rs

@@ -299,7 +299,7 @@ impl ObjectType {
     pub fn str(&self) -> &'static str {
         unsafe {
             let ptr = call!(raw::git_object_type2string(*self));
-            str::raw::c_str_to_static_slice(ptr)
+            mem::transmute::<&str, &'static str>(str::from_c_str(ptr))
         }
     }
 

src/remote_callbacks.rs

@@ -198,9 +198,9 @@ extern fn sideband_progress_cb(str: *const libc::c_char,
             Some(ref mut c) => c,
             None => return 0,
         };
-        let r = slice::raw::buf_as_slice(str as *const u8, len as uint, |buf| {
-            (*callback)(buf)
-        });
+        let ptr = str as *const u8;
+        let buf = slice::from_raw_buf(&ptr, len as uint);
+        let r = (*callback)(buf);
         if r {0} else {-1}
     }
 }