extrawurst/gitui
1
1
Fork 0
mirror of https://github.com/extrawurst/gitui.git synced 2024-11-27 00:14:52 +03:00
Code Issues Projects Releases Wiki Activity

clippy nightly complaint

Browse Source
This commit is contained in:
Stephan Dilly 2020-12-08 00:51:41 +01:00
parent e7976235c7
commit 7174817777
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
asyncgit/src/sync/remotes.rs
View File

@ -75,10 +75,7 @@ pub fn fetch_origin(repo_path: &str, branch: &str) -> Result<usize> {
let mut remote = repo.find_remote(DEFAULT_REMOTE_NAME)?;
let mut options = FetchOptions::new();
options.remote_callbacks(match remote_callbacks(None, None) {
Ok(callback) => callback,
Err(e) => return Err(e),
});
options.remote_callbacks(remote_callbacks(None, None));
remote.fetch(&[branch], Some(&mut options), None)?;
@ -100,15 +97,10 @@ pub fn push(
let mut options = PushOptions::new();
options.remote_callbacks(
match remote_callbacks(
Some(progress_sender),
basic_credential,
) {
Ok(callbacks) => callbacks,
Err(e) => return Err(e),
},
);
options.remote_callbacks(remote_callbacks(
Some(progress_sender),
basic_credential,
));
options.packbuilder_parallelism(0);
remote.push(&[branch], Some(&mut options))?;
@ -119,7 +111,7 @@ pub fn push(
fn remote_callbacks<'a>(
sender: Option<Sender<ProgressNotification>>,
basic_credential: Option<BasicAuthCredential>,
) -> Result<RemoteCallbacks<'a>> {
) -> RemoteCallbacks<'a> {
let mut callbacks = RemoteCallbacks::new();
let sender_clone = sender.clone();
callbacks.push_transfer_progress(move |current, total, bytes| {
@ -228,7 +220,7 @@ fn remote_callbacks<'a>(
},
);
Ok(callbacks)
callbacks
}
#[cfg(test)]