Update to rust master

Author: alexcrichton

examples/clone.rs

@@ -85,7 +85,7 @@ fn run(args: &Args) -> Result<(), git2::Error> {
     let mut co = CheckoutBuilder::new();
     co.progress(|path, cur, total| {
         let mut state = state.borrow_mut();
-        state.path = Path::new(path.unwrap_or(&[]));
+        state.path = Path::new(path);
         state.current = cur;
         state.total = total;
         print(&mut *state);

src/build.rs

@@ -39,7 +39,7 @@ pub struct CheckoutBuilder<'cb> {
 ///
 /// The first argument is the path for the notification, the next is the numver
 /// of completed steps so far, and the final is the total number of steps.
-pub type Progress<'a> = FnMut(Option<&[u8]>, uint, uint) + 'a;
+pub type Progress<'a> = FnMut(&[u8], uint, uint) + 'a;
 
 impl<'cb> RepoBuilder<'cb> {
     /// Creates a new repository builder with all of the default configuration.
@@ -375,7 +375,7 @@ impl<'cb> CheckoutBuilder<'cb> {
 
     /// Set a callback to receive notifications of checkout progress.
     pub fn progress<F>(&mut self, cb: F) -> &mut CheckoutBuilder<'cb>
-                       where F: FnMut(Option<&[u8]>, uint, uint) + 'cb {
+                       where F: FnMut(&[u8], uint, uint) + 'cb {
         self.progress = Some(box cb as Box<Progress<'cb>>);
         self
     }
@@ -430,13 +430,9 @@ extern fn progress_cb(path: *const c_char,
             Some(ref mut c) => c,
             None => return,
         };
-        let path = if path.is_null() {
-            None
-        } else {
-            Some(CString::new(path, false))
-        };
+        let path = CString::new(path, false);
         panic::wrap(|| {
-            callback.call_mut((path.as_ref().map(|p| p.as_bytes_no_nul()),
+            callback.call_mut((path.as_bytes_no_nul(),
                                completed as uint, total as uint));
         });
     }

src/remote_callbacks.rs

@@ -35,7 +35,8 @@ enum ProgressState {
 /// * `username_from_url` - the username that was embedded in the url, or `None`
 ///                         if it was not included.
 /// * `allowed_types` - a bitmask stating which cred types are ok to return.
-pub type Credentials<'a> = FnMut(&str, Option<&str>, CredentialType)
+// FIXME: the second &str should be Option<&str> but that currently ICEs
+pub type Credentials<'a> = FnMut(&str, &str, CredentialType)
                                  -> Result<Cred, Error> + 'a;
 
 /// Callback to be invoked while a transfer is in progress.
@@ -68,7 +69,7 @@ impl<'a> RemoteCallbacks<'a> {
 
     /// The callback through which to fetch credentials if required.
     pub fn credentials<F>(&mut self, cb: F) -> &mut RemoteCallbacks<'a>
-                          where F: FnMut(&str, Option<&str>, CredentialType)
+                          where F: FnMut(&str, &str, CredentialType)
                                          -> Result<Cred, Error> + 'a
     {
         self.credentials = Some(box cb as Box<Credentials<'a>>);
@@ -219,6 +220,7 @@ extern fn credentials_cb(ret: *mut *mut raw::git_cred,
             },
             None => None,
         };
+        let username_from_url = username_from_url.unwrap_or("");
 
         let cred_type = CredentialType::from_bits_truncate(allowed_types as uint);
         match panic::wrap(|| {

src/submodule.rs

@@ -239,7 +239,7 @@ mod tests {
 
         let mut submodules = repo.submodules().unwrap();
         assert_eq!(submodules.len(), 2);
-        let mut s = submodules.remove(0).unwrap();
+        let mut s = submodules.remove(0);
         assert_eq!(s.name(), Some("bar"));
         assert_eq!(s.url(), Some("/path/to/nowhere"));
         assert_eq!(s.branch(), None);