Skip to content

Commit 545b7d2

Browse files
committed
Update to rust master
Closes #10
1 parent 96b9500 commit 545b7d2

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

libgit2/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ extern crate "link-config" as link_config;
77
extern crate "openssl-static-sys" as openssl_static_sys;
88
extern crate libc;
99

10-
use std::os;
1110
use libc::{c_int, c_char, c_uint, size_t, c_uchar, c_void, c_ushort};
1211

1312
pub static GIT_OID_RAWSZ: uint = 20;

src/branch.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ impl<'a> Branch<'a> {
4141
}
4242

4343
/// Move/rename an existing local branch reference.
44-
pub fn move(&mut self, new_branch_name: &str, force: bool,
45-
signature: Option<&Signature>,
46-
log_message: &str) -> Result<Branch<'a>, Error> {
44+
pub fn rename(&mut self, new_branch_name: &str, force: bool,
45+
signature: Option<&Signature>,
46+
log_message: &str) -> Result<Branch<'a>, Error> {
4747
let mut ret = 0 as *mut raw::git_reference;
4848
unsafe {
4949
try_call!(raw::git_branch_move(&mut ret, self.get().raw(),
@@ -151,7 +151,7 @@ mod tests {
151151

152152
assert_eq!(repo.branches(None).unwrap().count(), 3);
153153
repo.find_branch("foo", ::BranchLocal).unwrap();
154-
let mut b1 = b1.move("bar", false, Some(&sig), "bar2").unwrap();
154+
let mut b1 = b1.rename("bar", false, Some(&sig), "bar2").unwrap();
155155
assert_eq!(b1.name().unwrap(), Some("bar"));
156156
assert!(b1.upstream().is_err());
157157
b1.set_upstream(Some("master")).unwrap();

0 commit comments

Comments
 (0)