Update to rust master

alexcrichton · alexcrichton · commit 30eb9d311896 · 2015-01-06T08:41:58.000-08:00
diff --git a/examples/add.rs b/examples/add.rs
@@ -12,7 +12,6 @@
  * <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
 
-#![feature(old_orphan_check)]
 #![deny(warnings)]
 
 extern crate git2;
@@ -34,21 +33,22 @@ fn run(args: &Args) -> Result<(), git2::Error> {
     let repo = try!(Repository::open(&Path::new(".")));
     let mut index = try!(repo.index());
 
-    let cb = if args.flag_verbose || args.flag_update {
-        Some(|path: &[u8], _matched_spec: &[u8]| -> int {
-            let path = Path::new(path);
-            let status = repo.status_file(&path).unwrap();
+    let cb = (&mut |&mut: path: &[u8], _matched_spec: &[u8]| -> int {
+        let path = Path::new(path);
+        let status = repo.status_file(&path).unwrap();
 
-            let ret = if status.contains(git2::STATUS_WT_MODIFIED) ||
-                         status.contains(git2::STATUS_WT_NEW) {
-                println!("add '{}'", path.display());
-                0
-            } else {
-                1
-            };
+        let ret = if status.contains(git2::STATUS_WT_MODIFIED) ||
+                     status.contains(git2::STATUS_WT_NEW) {
+            println!("add '{}'", path.display());
+            0
+        } else {
+            1
+        };
 
-            if args.flag_dry_run {1} else {ret}
-        })
+        if args.flag_dry_run {1} else {ret}
+    }) as &mut git2::IndexMatchedPath;
+    let cb = if args.flag_verbose || args.flag_update {
+        Some(cb)
     } else {
         None
     };
diff --git a/examples/clone.rs b/examples/clone.rs
@@ -12,7 +12,6 @@
  * <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
 
-#![feature(old_orphan_check)]
 #![deny(warnings)]
 
 extern crate git2;
diff --git a/examples/fetch.rs b/examples/fetch.rs
@@ -12,7 +12,6 @@
  * <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
 
-#![feature(old_orphan_check)]
 #![deny(warnings)]
 
 extern crate git2;
diff --git a/examples/init.rs b/examples/init.rs
@@ -12,7 +12,6 @@
  * <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
 
-#![feature(old_orphan_check)]
 #![deny(warnings)]
 
 extern crate git2;
diff --git a/examples/log.rs b/examples/log.rs
@@ -12,7 +12,7 @@
  * <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
 
-#![feature(macro_rules, old_orphan_check)]
+#![feature(macro_rules)]
 #![deny(warnings)]
 
 extern crate "rustc-serialize" as rustc_serialize;
diff --git a/examples/ls-remote.rs b/examples/ls-remote.rs
@@ -12,7 +12,6 @@
  * <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
 
-#![feature(old_orphan_check)]
 #![deny(warnings)]
 
 extern crate git2;
diff --git a/examples/rev-list.rs b/examples/rev-list.rs
@@ -13,7 +13,7 @@
  * <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
 
-#![feature(slicing_syntax, old_orphan_check)]
+#![feature(slicing_syntax)]
 #![deny(warnings)]
 
 extern crate git2;
diff --git a/examples/rev-parse.rs b/examples/rev-parse.rs
@@ -12,7 +12,6 @@
  * <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
 
-#![feature(old_orphan_check)]
 #![deny(warnings)]
 
 extern crate git2;
diff --git a/examples/status.rs b/examples/status.rs
@@ -12,7 +12,6 @@
  * <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
 
-#![feature(old_orphan_check)]
 #![deny(warnings)]
 
 extern crate git2;
diff --git a/src/build.rs b/src/build.rs
@@ -432,8 +432,7 @@ extern fn progress_cb(path: *const c_char,
         };
         let path = CString::new(path, false);
         panic::wrap(|| {
-            callback.call_mut((path.as_bytes_no_nul(),
-                               completed as uint, total as uint));
+            callback(path.as_bytes_no_nul(), completed as uint, total as uint);
         });
     }
 }
diff --git a/src/index.rs b/src/index.rs
@@ -27,7 +27,7 @@ pub struct IndexEntries<'index> {
 /// Used by `Index::{add_all,remove_all,update_all}`.  The first argument is the
 /// path, and the second is the patchspec that matched it.  Return 0 to confirm
 /// the operation on the item, > 0 to skip the item, and < 0 to abort the scan.
-pub type IndexMatchedPath<'a> = |&[u8], &[u8]|: 'a -> int;
+pub type IndexMatchedPath<'a> = FnMut(&[u8], &[u8]) -> int + 'a;
 
 /// A structure to represent an entry or a file inside of an index.
 ///
@@ -162,7 +162,7 @@ impl Index {
     pub fn add_all<T: ToCStr>(&mut self,
                               pathspecs: &[T],
                               flag: IndexAddOption,
-                              mut cb: Option<IndexMatchedPath>)
+                              mut cb: Option<&mut IndexMatchedPath>)
                               -> Result<(), Error> {
         let arr = pathspecs.iter().map(|t| t.to_c_str()).collect::<Vec<CString>>();
         let strarray = arr.iter().map(|c| c.as_ptr())
@@ -299,7 +299,7 @@ impl Index {
     /// the item, > 0 to skip the item, and < 0 to abort the scan.
     pub fn remove_all<T: ToCStr>(&mut self,
                                  pathspecs: &[T],
-                                 mut cb: Option<IndexMatchedPath>)
+                                 mut cb: Option<&mut IndexMatchedPath>)
                                  -> Result<(), Error> {
         let arr = pathspecs.iter().map(|t| t.to_c_str()).collect::<Vec<CString>>();
         let strarray = arr.iter().map(|c| c.as_ptr())
@@ -338,7 +338,7 @@ impl Index {
     /// updating the item, > 0 to skip the item, and < 0 to abort the scan.
     pub fn update_all<T: ToCStr>(&mut self,
                                  pathspecs: &[T],
-                                 mut cb: Option<IndexMatchedPath>)
+                                 mut cb: Option<&mut IndexMatchedPath>)
                                  -> Result<(), Error> {
         let arr = pathspecs.iter().map(|t| t.to_c_str()).collect::<Vec<CString>>();
         let strarray = arr.iter().map(|c| c.as_ptr())
@@ -408,7 +408,7 @@ extern fn index_matched_path_cb(path: *const libc::c_char,
     unsafe {
         let path = CString::new(path, false);
         let matched_pathspec = CString::new(matched_pathspec, false);
-        let payload = payload as *mut IndexMatchedPath;
+        let payload = payload as *mut &mut IndexMatchedPath;
         (*payload)(path.as_bytes_no_nul(),
                    matched_pathspec.as_bytes_no_nul()) as libc::c_int
     }
@@ -516,23 +516,24 @@ mod tests {
         fs::mkdir(&root.join("foo"), io::USER_DIR).unwrap();
         File::create(&root.join("foo/bar")).unwrap();
         let mut called = false;
-        index.add_all(&["foo"], ::ADD_DEFAULT, Some(|a: &[u8], b: &[u8]| {
+        index.add_all(&["foo"], ::ADD_DEFAULT,
+                      Some((&mut |&mut: a: &[u8], b: &[u8]| {
             assert!(!called);
             called = true;
             assert_eq!(b, b"foo");
             assert_eq!(a, b"foo/bar");
             0
-        })).unwrap();
+        }) as &mut super::IndexMatchedPath)).unwrap();
         assert!(called);
 
         called = false;
-        index.remove_all(&["."], Some(|a: &[u8], b: &[u8]| {
+        index.remove_all(&["."], Some((&mut |&mut: a: &[u8], b: &[u8]| {
             assert!(!called);
             called = true;
             assert_eq!(b, b".");
             assert_eq!(a, b"foo/bar");
             0
-        })).unwrap();
+        }) as &mut super::IndexMatchedPath)).unwrap();
         assert!(called);
     }
 
diff --git a/src/lib.rs b/src/lib.rs
@@ -63,7 +63,7 @@
 //! source `Repository`, to ensure that they do not outlive the repository
 //! itself.
 
-#![feature(macro_rules, unsafe_destructor, unboxed_closures)]
+#![feature(macro_rules, unsafe_destructor)]
 #![feature(associated_types)]
 #![deny(missing_docs)]
 #![cfg_attr(test, deny(warnings))]
diff --git a/src/remote_callbacks.rs b/src/remote_callbacks.rs
@@ -224,7 +224,7 @@ extern fn credentials_cb(ret: *mut *mut raw::git_cred,
 
         let cred_type = CredentialType::from_bits_truncate(allowed_types as uint);
         match panic::wrap(|| {
-            callback.call_mut((url, username_from_url, cred_type))
+            callback(url, username_from_url, cred_type)
         }) {
             Some(Ok(cred)) => {
                 // Turns out it's a memory safety issue if we pass through any
@@ -252,7 +252,7 @@ extern fn transfer_progress_cb(stats: *const raw::git_transfer_progress,
         };
         let progress = Progress::from_raw(stats);
         let ok = panic::wrap(move || {
-            callback.call_mut((progress,))
+            callback(progress)
         }).unwrap_or(false);
         if ok {0} else {-1}
     }
@@ -270,7 +270,7 @@ extern fn sideband_progress_cb(str: *const c_char,
         let ptr = str as *const u8;
         let buf = slice::from_raw_buf(&ptr, len as uint);
         let ok = panic::wrap(|| {
-            callback.call_mut((buf,))
+            callback(buf)
         }).unwrap_or(false);
         if ok {0} else {-1}
     }
@@ -291,7 +291,7 @@ extern fn update_tips_cb(refname: *const c_char,
         let a = Oid::from_raw(a);
         let b = Oid::from_raw(b);
         let ok = panic::wrap(|| {
-            callback.call_mut((refname, a, b))
+            callback(refname, a, b)
         }).unwrap_or(false);
         if ok {0} else {-1}
     }
diff --git a/src/repo.rs b/src/repo.rs
@@ -1201,7 +1201,7 @@ impl RepositoryInitOptions {
                                 raw::GIT_REPOSITORY_INIT_OPTIONS_VERSION), 0);
         opts.flags = self.flags;
         opts.mode = self.mode;
-        let cstr = |a: &Option<CString>| {
+        let cstr = |&: a: &Option<CString>| {
             a.as_ref().map(|s| s.as_ptr()).unwrap_or(0 as *const _)
         };
         opts.workdir_path = cstr(&self.workdir_path);

Original file line number	Diff line number	Diff line change
`@@ -432,8 +432,7 @@ extern fn progress_cb(path: *const c_char,`
`432`	`432`	`};`
`433`	`433`	`let path = CString::new(path, false);`
`434`	`434`	`panic::wrap(\|\| {`
`435`		`- callback.call_mut((path.as_bytes_no_nul(),`
`436`		`- completed as uint, total as uint));`
	`435`	`+ callback(path.as_bytes_no_nul(), completed as uint, total as uint);`
`437`	`436`	`});`
`438`	`437`	`}`
`439`	`438`	`}`