From a1b41825fa62f6ad13beb0648b0f31547605ff99 Mon Sep 17 00:00:00 2001 From: yottalogical Date: Mon, 8 Jul 2024 19:04:50 -0400 Subject: [PATCH] Fix clippy warnings --- src/main.rs | 6 +++--- src/safe_rebase.rs | 6 +----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main.rs b/src/main.rs index fda387b..b309988 100644 --- a/src/main.rs +++ b/src/main.rs @@ -16,9 +16,9 @@ fn main() { safe_rebase( repo_path.as_deref(), - upstream.as_ref().map(String::as_str), - branch.as_ref().map(String::as_str), + upstream.as_deref(), + branch.as_deref(), interactive, - onto.as_ref().map(String::as_str), + onto.as_deref(), ); } diff --git a/src/safe_rebase.rs b/src/safe_rebase.rs index 008dc87..25bf47f 100644 --- a/src/safe_rebase.rs +++ b/src/safe_rebase.rs @@ -114,11 +114,7 @@ fn get_prefetch_reference<'repo>( .unwrap() } -fn get_commits_to_rebase<'repo>( - repo: &'repo Repository, - upstream: &Reference, - branch: &Branch, -) -> HashSet { +fn get_commits_to_rebase(repo: &Repository, upstream: &Reference, branch: &Branch) -> HashSet { let mut revwalk = repo.revwalk().unwrap(); revwalk .push(branch.get().peel_to_commit().unwrap().id())