Bump to 0.1.9

Author: alexcrichton

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "git2"
-version = "0.1.8"
+version = "0.1.9"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 license = "MIT/Apache-2.0"
 readme = "README.md"

examples/add.rs

@@ -34,7 +34,7 @@ fn run(args: &Args) -> Result<(), git2::Error> {
     let repo = try!(Repository::open(&Path::new(".")));
     let mut index = try!(repo.index());
 
-    let cb = (&mut |&mut: path: &[u8], _matched_spec: &[u8]| -> int {
+    let cb = (&mut |&mut: path: &[u8], _matched_spec: &[u8]| -> i32 {
         let path = Path::new(path);
         let status = repo.status_file(&path).unwrap();
 
@@ -55,9 +55,9 @@ fn run(args: &Args) -> Result<(), git2::Error> {
     };
 
     if args.flag_update {
-        try!(index.update_all(args.arg_spec.as_slice(), cb));
+        try!(index.update_all(args.arg_spec.iter(), cb));
     } else {
-        try!(index.add_all(args.arg_spec.as_slice(), git2::ADD_DEFAULT, cb));
+        try!(index.add_all(args.arg_spec.iter(), git2::ADD_DEFAULT, cb));
     }
 
     try!(index.write());

examples/clone.rs

@@ -33,8 +33,8 @@ struct Args {
 
 struct State {
     progress: Option<Progress<'static>>,
-    total: uint,
-    current: uint,
+    total: usize,
+    current: usize,
     path: Path,
     newline: bool,
 }

examples/log.rs

@@ -12,8 +12,6 @@
  * <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
 
-#![feature(macro_rules)]
-#![deny(warnings)]
 #![allow(unstable)]
 
 extern crate "rustc-serialize" as rustc_serialize;
@@ -37,14 +35,14 @@ struct Args {
     flag_committer: Option<String>,
     flag_grep: Option<String>,
     flag_git_dir: Option<String>,
-    flag_skip: Option<uint>,
-    flag_max_count: Option<uint>,
+    flag_skip: Option<usize>,
+    flag_max_count: Option<usize>,
     flag_merges: bool,
     flag_no_merges: bool,
     flag_no_min_parents: bool,
     flag_no_max_parents: bool,
-    flag_max_parents: Option<uint>,
-    flag_min_parents: Option<uint>,
+    flag_max_parents: Option<usize>,
+    flag_min_parents: Option<usize>,
     flag_patch: bool,
 }
 
@@ -221,12 +219,12 @@ fn match_with_parent(repo: &Repository, commit: &Commit, parent: &Commit,
 }
 
 impl Args {
-    fn min_parents(&self) -> uint {
+    fn min_parents(&self) -> usize {
         if self.flag_no_min_parents { return 0 }
         self.flag_min_parents.unwrap_or(if self.flag_merges {2} else {0})
     }
 
-    fn max_parents(&self) -> Option<uint> {
+    fn max_parents(&self) -> Option<usize> {
         if self.flag_no_max_parents { return None }
         self.flag_max_parents.or(if self.flag_no_merges {Some(1)} else {None})
     }

examples/ls-remote.rs

@@ -12,8 +12,8 @@
  * <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
 
-#![deny(warnings)]
 #![allow(unstable)]
+#![deny(warnings)]
 
 extern crate git2;
 extern crate docopt;

examples/rev-list.rs

@@ -13,7 +13,6 @@
  * <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
 
-#![feature(slicing_syntax)]
 #![deny(warnings)]
 #![allow(unstable)]
 

examples/rev-parse.rs

@@ -32,7 +32,7 @@ fn run(args: &Args) -> Result<(), git2::Error> {
     let path = args.flag_git_dir.as_ref().map(Path::new).unwrap_or(Path::new("."));
     let repo = try!(Repository::open(&path));
 
-    let revspec = try!(repo.revparse(args.arg_spec.as_slice()));
+    let revspec = try!(repo.revparse(&args.arg_spec[]));
 
     if revspec.mode().contains(git2::REVPARSE_SINGLE) {
         println!("{}", revspec.from().unwrap().id());

libgit2-sys/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "libgit2-sys"
-version = "0.1.5"
+version = "0.1.6"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 links = "git2"
 build = "build.rs"

libgit2-sys/build.rs

@@ -1,3 +1,5 @@
+#![allow(unstable)]
+
 extern crate "pkg-config" as pkg_config;
 
 use std::os;

libgit2-sys/lib.rs

@@ -1,5 +1,7 @@
 #![allow(non_camel_case_types, missing_copy_implementations)]
+#![allow(raw_pointer_derive)]
 
+#[allow(unstable)]
 extern crate libc;
 extern crate "libssh2-sys" as libssh2;
 #[cfg(unix)] extern crate "openssl-sys" as openssl;
@@ -36,8 +38,8 @@ pub use git_diff_stats_format_t::*;
 
 use libc::{c_int, c_char, c_uint, size_t, c_uchar, c_void, c_ushort};
 
-pub const GIT_OID_RAWSZ: uint = 20;
-pub const GIT_OID_HEXSZ: uint = GIT_OID_RAWSZ * 2;
+pub const GIT_OID_RAWSZ: usize = 20;
+pub const GIT_OID_HEXSZ: usize = GIT_OID_RAWSZ * 2;
 pub const GIT_CLONE_OPTIONS_VERSION: c_uint = 1;
 pub const GIT_CHECKOUT_OPTIONS_VERSION: c_uint = 1;
 pub const GIT_REMOTE_CALLBACKS_VERSION: c_uint = 1;
@@ -77,19 +79,19 @@ pub struct git_revspec {
 }
 
 #[repr(C)]
-#[derive(Show)]
 pub struct git_error {
     pub message: *mut c_char,
     pub klass: c_int,
 }
 
 #[repr(C)]
-#[derive(Copy,Show)]
+#[derive(Copy)]
 pub struct git_oid {
     pub id: [u8; GIT_OID_RAWSZ],
 }
 
 #[repr(C)]
+#[derive(Copy)]
 pub struct git_strarray {
     pub strings: *mut *mut c_char,
     pub count: size_t,
@@ -103,7 +105,7 @@ pub struct git_signature {
 }
 
 #[repr(C)]
-#[derive(Copy)]
+#[derive(Copy, Clone, Eq, PartialEq)]
 pub struct git_time {
     pub time: git_time_t,
     pub offset: c_int,
@@ -118,7 +120,7 @@ pub const GIT_REVPARSE_RANGE: c_int = 1 << 1;
 pub const GIT_REVPARSE_MERGE_BASE: c_int = 1 << 2;
 
 #[repr(C)]
-#[derive(PartialEq, Eq, Clone, Show, Copy)]
+#[derive(PartialEq, Eq, Clone, Copy)]
 pub enum git_error_code {
     GIT_OK = 0,
 
@@ -465,7 +467,7 @@ pub enum git_ref_t {
     GIT_REF_INVALID = 0,
     GIT_REF_OID = 1,
     GIT_REF_SYMBOLIC = 2,
-    GIT_REF_LISTALL = GIT_REF_OID as int | GIT_REF_SYMBOLIC as int,
+    GIT_REF_LISTALL = GIT_REF_OID as isize | GIT_REF_SYMBOLIC as isize,
 }
 
 #[repr(C)]
@@ -490,6 +492,7 @@ pub type git_treewalk_cb = extern fn(*const c_char, *const git_tree_entry,
                                      *mut c_void) -> c_int;
 
 #[repr(C)]
+#[derive(Copy)]
 pub struct git_buf {
     pub ptr: *mut c_char,
     pub asize: size_t,
@@ -501,13 +504,14 @@ pub struct git_buf {
 pub enum git_branch_t {
     GIT_BRANCH_LOCAL = 1,
     GIT_BRANCH_REMOTE = 2,
-    GIT_BRANCH_ALL = GIT_BRANCH_LOCAL as int | GIT_BRANCH_REMOTE as int,
+    GIT_BRANCH_ALL = GIT_BRANCH_LOCAL as isize | GIT_BRANCH_REMOTE as isize,
 }
 
 pub type git_index_matched_path_cb = extern fn(*const c_char, *const c_char,
                                                *mut c_void) -> c_int;
 
 #[repr(C)]
+#[derive(Copy)]
 pub struct git_index_entry {
     pub ctime: git_index_time,
     pub mtime: git_index_time,
@@ -524,7 +528,7 @@ pub struct git_index_entry {
 }
 
 #[repr(C)]
-#[derive(Copy)]
+#[derive(Copy, Clone, Eq, PartialEq)]
 pub struct git_index_time {
     pub seconds: git_time_t,
     pub nanoseconds: c_uint,

src/blob.rs

@@ -1,8 +1,9 @@
 use std::marker;
 use std::mem;
-use std::raw as stdraw;
+use std::slice;
 
 use {raw, Oid};
+use util::Binding;
 
 /// A structure to represent a git [blob][1]
 ///
@@ -13,25 +14,11 @@ pub struct Blob<'repo> {
 }
 
 impl<'repo> Blob<'repo> {
-    /// Create a new object from its raw component.
-    ///
-    /// This method is unsafe as there is no guarantee that `raw` is a valid
-    /// pointer.
-    pub unsafe fn from_raw(raw: *mut raw::git_blob) -> Blob<'repo> {
-        Blob {
-            raw: raw,
-            marker: marker::ContravariantLifetime,
-        }
-    }
-
     /// Get the id (SHA1) of a repository blob
     pub fn id(&self) -> Oid {
-        unsafe { Oid::from_raw(raw::git_blob_id(&*self.raw)) }
+        unsafe { Binding::from_raw(raw::git_blob_id(&*self.raw)) }
     }
 
-    /// Get access to the underlying raw pointer.
-    pub fn raw(&self) -> *mut raw::git_blob { self.raw }
-
     /// Determine if the blob content is most certainly binary or not.
     pub fn is_binary(&self) -> bool {
         unsafe { raw::git_blob_is_binary(&*self.raw) == 1 }
@@ -40,14 +27,26 @@ impl<'repo> Blob<'repo> {
     /// Get the content of this blob.
     pub fn content(&self) -> &[u8] {
         unsafe {
-            mem::transmute(stdraw::Slice {
-                data: raw::git_blob_rawcontent(&*self.raw) as *const u8,
-                len: raw::git_blob_rawsize(&*self.raw) as uint,
-            })
+            let data = raw::git_blob_rawcontent(&*self.raw) as *const u8;
+            let len = raw::git_blob_rawsize(&*self.raw) as usize;
+            slice::from_raw_buf(mem::copy_lifetime(self, &data), len)
+        }
+    }
+}
+
+impl<'repo> Binding for Blob<'repo> {
+    type Raw = *mut raw::git_blob;
+
+    unsafe fn from_raw(raw: *mut raw::git_blob) -> Blob<'repo> {
+        Blob {
+            raw: raw,
+            marker: marker::ContravariantLifetime,
         }
     }
+    fn raw(&self) -> *mut raw::git_blob { self.raw }
 }
 
+
 #[unsafe_destructor]
 impl<'repo> Drop for Blob<'repo> {
     fn drop(&mut self) {

src/branch.rs

@@ -4,6 +4,7 @@ use std::str;
 use libc;
 
 use {raw, Error, Reference, Signature, BranchType};
+use util::Binding;
 
 /// A structure to represent a git [branch][1]
 ///
@@ -47,14 +48,14 @@ impl<'repo> Branch<'repo> {
                   signature: Option<&Signature>,
                   log_message: &str) -> Result<Branch<'repo>, Error> {
         let mut ret = 0 as *mut raw::git_reference;
+        let new_branch_name = CString::from_slice(new_branch_name.as_bytes());
+        let log_message = CString::from_slice(log_message.as_bytes());
         unsafe {
             try_call!(raw::git_branch_move(&mut ret, self.get().raw(),
-                                           CString::from_slice(new_branch_name.as_bytes()),
-                                           force,
-                                           &*signature.map(|s| s.raw())
-                                                      .unwrap_or(0 as *mut _),
-                                           CString::from_slice(log_message.as_bytes())));
-            Ok(Branch::wrap(Reference::from_raw(ret)))
+                                           new_branch_name, force,
+                                           signature.map(|s| s.raw()),
+                                           log_message));
+            Ok(Branch::wrap(Binding::from_raw(ret)))
         }
     }
 
@@ -80,7 +81,7 @@ impl<'repo> Branch<'repo> {
         let mut ret = 0 as *mut raw::git_reference;
         unsafe {
             try_call!(raw::git_branch_upstream(&mut ret, &*self.get().raw()));
-            Ok(Branch::wrap(Reference::from_raw(ret)))
+            Ok(Branch::wrap(Binding::from_raw(ret)))
         }
     }
 
@@ -129,7 +130,7 @@ impl<'repo> Iterator for Branches<'repo> {
                 raw::GIT_BRANCH_REMOTE => BranchType::Remote,
                 raw::GIT_BRANCH_ALL => panic!("unexected branch type"),
             };
-            Some((Branch::wrap(Reference::from_raw(ret)), typ))
+            Some((Branch::wrap(Binding::from_raw(ret)), typ))
         }
     }
 }