Changeset View
Changeset View
Standalone View
Standalone View
lang/rust/files/patch-vendor_libgit2-sys_lib.rs
| Revert to libgit2 0.28 API per https://github.com/rust-lang/git2-rs/issues/458 | Revert to libgit2 0.28 API per https://github.com/rust-lang/git2-rs/issues/458 | ||||
| --- vendor/libgit2-sys/lib.rs.orig 2019-08-16 20:27:18 UTC | --- vendor/libgit2-sys/lib.rs.orig 2019-11-04 17:34:46 UTC | ||||
| +++ vendor/libgit2-sys/lib.rs | +++ vendor/libgit2-sys/lib.rs | ||||
| @@ -331,7 +331,6 @@ pub struct git_remote_callbacks { | @@ -331,7 +331,6 @@ pub struct git_remote_callbacks { | ||||
| pub push_negotiation: Option<git_push_negotiation>, | pub push_negotiation: Option<git_push_negotiation>, | ||||
| pub transport: Option<git_transport_cb>, | pub transport: Option<git_transport_cb>, | ||||
| pub payload: *mut c_void, | pub payload: *mut c_void, | ||||
| - pub resolve_url: Option<git_url_resolve_cb>, | - pub resolve_url: Option<git_url_resolve_cb>, | ||||
| } | } | ||||
| #[repr(C)] | #[repr(C)] | ||||
| @@ -385,8 +384,6 @@ pub type git_push_negotiation = | @@ -385,8 +384,6 @@ pub type git_push_negotiation = | ||||
| pub type git_push_update_reference_cb = | pub type git_push_update_reference_cb = | ||||
| extern "C" fn(*const c_char, *const c_char, *mut c_void) -> c_int; | extern "C" fn(*const c_char, *const c_char, *mut c_void) -> c_int; | ||||
| -pub type git_url_resolve_cb = | -pub type git_url_resolve_cb = | ||||
| - extern "C" fn(*mut git_buf, *const c_char, c_int, *mut c_void) -> c_int; | - extern "C" fn(*mut git_buf, *const c_char, c_int, *mut c_void) -> c_int; | ||||
| #[repr(C)] | #[repr(C)] | ||||
| pub struct git_push_update { | pub struct git_push_update { | ||||
| @@ -2233,7 +2230,7 @@ extern "C" { | @@ -2280,7 +2277,7 @@ extern "C" { | ||||
| source: *const git_tree, | source: *const git_tree, | ||||
| ) -> c_int; | ) -> c_int; | ||||
| pub fn git_treebuilder_clear(bld: *mut git_treebuilder); | pub fn git_treebuilder_clear(bld: *mut git_treebuilder); | ||||
| - pub fn git_treebuilder_entrycount(bld: *mut git_treebuilder) -> size_t; | - pub fn git_treebuilder_entrycount(bld: *mut git_treebuilder) -> size_t; | ||||
| + pub fn git_treebuilder_entrycount(bld: *mut git_treebuilder) -> c_uint; | + pub fn git_treebuilder_entrycount(bld: *mut git_treebuilder) -> c_uint; | ||||
| pub fn git_treebuilder_free(bld: *mut git_treebuilder); | pub fn git_treebuilder_free(bld: *mut git_treebuilder); | ||||
| pub fn git_treebuilder_get( | pub fn git_treebuilder_get( | ||||
| bld: *mut git_treebuilder, | bld: *mut git_treebuilder, | ||||