Tidy up some style and comments

alexcrichton · Aug 13, 2015 · 3eff94e · 3eff94e
1 parent e894583
commit 3eff94e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/reference.rs b/src/reference.rs
@@ -185,9 +185,10 @@ impl<'repo> Reference<'repo> {
     ///
     /// The new reference will be written to disk, overwriting the given
     /// reference.
-    pub fn set_target(&mut self, id: Oid, msg: &str) -> Result<Reference<'repo>, Error> {
+    pub fn set_target(&mut self, id: Oid, reflog_msg: &str)
+                      -> Result<Reference<'repo>, Error> {
         let mut raw = 0 as *mut raw::git_reference;
-        let msg = try!(CString::new(msg));
+        let msg = try!(CString::new(reflog_msg));
         unsafe {
             try_call!(raw::git_reference_set_target(&mut raw, self.raw,
                                                     id.raw(), msg));

diff --git a/src/repo.rs b/src/repo.rs
@@ -1123,8 +1123,7 @@ impl Repository {
             try_call!(raw::git_merge_commits(&mut raw, self.raw,
                                              our_commit.raw(),
                                              their_commit.raw(),
-                                             opts.map_or(0 as *const raw::git_merge_options,
-                                                         |o| o.raw())));
+                                             opts.map(|o| o.raw())));
             Ok(Binding::from_raw(raw))
         }
     }