Merge try_call_panic into try_call

Always check to be sure, and perhaps individual perf-related calls can check
more later.

Author: alexcrichton

src/build.rs

@@ -154,8 +154,8 @@ impl<'cb> RepoBuilder<'cb> {
 
         let mut raw = 0 as *mut raw::git_repository;
         unsafe {
-            try_call_panic!(raw::git_clone(&mut raw, url.to_c_str(),
-                                           into.to_c_str(), &opts));
+            try_call!(raw::git_clone(&mut raw, url.to_c_str(),
+                                     into.to_c_str(), &opts));
             Ok(Repository::from_raw(raw))
         }
     }

src/call.rs

@@ -9,14 +9,7 @@ macro_rules! call {
     )
 }
 
-
 macro_rules! try_call {
-    ($($arg:tt)*) => ({
-        try!(::call::try(call!($($arg)*)))
-    })
-}
-
-macro_rules! try_call_panic {
     ($($arg:tt)*) => ({
         match ::call::try(call!($($arg)*)) {
             Ok(o) => o,
@@ -25,12 +18,6 @@ macro_rules! try_call_panic {
     })
 }
 
-macro_rules! try_call {
-    ($($arg:tt)*) => ({
-        try!(::call::try(call!($($arg)*)))
-    })
-}
-
 #[doc(hidden)]
 pub trait Convert<T> {
     fn convert(&self) -> T;

src/diff.rs

@@ -243,8 +243,8 @@ impl Diff {
     pub fn print<F>(&self, format: DiffFormat, mut cb: F) -> Result<(), Error>
                     where F: FnMut(DiffDelta, DiffHunk, DiffLine) -> bool {
         unsafe {
-            try_call_panic!(raw::git_diff_print(self.raw, format, print::<F>,
-                                                &mut cb as *mut _ as *mut _));
+            try_call!(raw::git_diff_print(self.raw, format, print::<F>,
+                                          &mut cb as *mut _ as *mut _));
             return Ok(())
         }
         extern fn print<F>(delta: *const raw::git_diff_delta,

src/remote.rs

@@ -97,7 +97,7 @@ impl<'repo, 'cb> Remote<'repo, 'cb> {
     pub fn connect(&mut self, dir: Direction) -> Result<(), Error> {
         unsafe {
             try!(self.set_raw_callbacks());
-            try_call_panic!(raw::git_remote_connect(self.raw, dir));
+            try_call!(raw::git_remote_connect(self.raw, dir));
         }
         Ok(())
     }
@@ -217,7 +217,7 @@ impl<'repo, 'cb> Remote<'repo, 'cb> {
         unsafe {
             try!(self.set_raw_callbacks());
             // FIXME expose refspec array at the API level
-            try_call_panic!(raw::git_remote_download(self.raw, 0 as *const _));
+            try_call!(raw::git_remote_download(self.raw, 0 as *const _));
         }
         Ok(())
     }
@@ -244,7 +244,7 @@ impl<'repo, 'cb> Remote<'repo, 'cb> {
         };
         unsafe {
             try!(self.set_raw_callbacks());
-            try_call_panic!(raw::git_remote_fetch(self.raw,
+            try_call!(raw::git_remote_fetch(self.raw,
                                             &arr,
                                             &*signature.map(|s| s.raw())
                                                        .unwrap_or(0 as *mut _),
@@ -276,7 +276,7 @@ impl<'repo, 'cb> Remote<'repo, 'cb> {
         let mut ret = 0 as *mut raw::git_push;
         try!(self.set_raw_callbacks());
         unsafe {
-            try_call_panic!(raw::git_push_new(&mut ret, self.raw));
+            try_call!(raw::git_push_new(&mut ret, self.raw));
             Ok(Push::from_raw(ret))
         }
     }