From 5fe839e2bf8ceb2931c1984efb2d956980431203 Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Mon, 16 Dec 2024 07:58:54 +0000 Subject: chore: nix flake update update nix dependancies to latest version using default update options fix warning related to idomatic patterns --- src/bin/git_remote_nostr/fetch.rs | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'src/bin/git_remote_nostr/fetch.rs') diff --git a/src/bin/git_remote_nostr/fetch.rs b/src/bin/git_remote_nostr/fetch.rs index 90387f3..458c6d8 100644 --- a/src/bin/git_remote_nostr/fetch.rs +++ b/src/bin/git_remote_nostr/fetch.rs @@ -141,9 +141,11 @@ async fn fetch_proposals( let current_user = get_curent_user(git_repo)?; for refstr in proposal_refs.keys() { - if let Some((_, (_, patches))) = - find_proposal_and_patches_by_branch_name(refstr, &open_proposals, ¤t_user) - { + if let Some((_, (_, patches))) = find_proposal_and_patches_by_branch_name( + refstr, + &open_proposals, + current_user.as_ref(), + ) { if let Err(error) = make_commits_for_proposal(git_repo, repo_ref, patches) { term.write_line( format!("WARNING: failed to create branch for {refstr}, error: {error}",) @@ -234,7 +236,7 @@ pub fn fetch_from_git_server( fn report_on_transfer_progress( progress_stats: &Progress<'_>, start_time: &Instant, - end_time: &Option, + end_time: Option<&Instant>, ) -> Vec { let mut report = vec![]; let total = progress_stats.total_objects() as f64; @@ -378,8 +380,11 @@ impl<'a> FetchReporter<'a> { self.start_time = Some(Instant::now()); } let existing_lines = self.just_count_transfer_progress(); - let updated = - report_on_transfer_progress(progress_stats, &self.start_time.unwrap(), &self.end_time); + let updated = report_on_transfer_progress( + progress_stats, + &self.start_time.unwrap(), + self.end_time.as_ref(), + ); if self.transfer_progress_msgs.len() <= updated.len() { if self.end_time.is_none() && updated.first().is_some_and(|f| f.contains("100%")) { self.end_time = Some(Instant::now()); -- cgit v1.2.3