cleanup: fix latest nightly lint warnings

arxanas · Dec 2, 2024 · 4275c65 · 4275c65
1 parent b5a6bfd
commit 4275c65
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 18 deletions.
diff --git a/git-branchless-lib/src/core/effects.rs b/git-branchless-lib/src/core/effects.rs
@@ -1000,7 +1000,7 @@ impl Drop for ProgressHandle<'_> {
     }
 }
 
-impl<'a> ProgressHandle<'a> {
+impl ProgressHandle<'_> {
     /// Notify the progress meter that the current operation has `total`
     /// discrete units of work, and it's currently `current` units of the way
     /// through the operation.

diff --git a/git-branchless-lib/src/core/node_descriptors.rs b/git-branchless-lib/src/core/node_descriptors.rs
@@ -44,7 +44,7 @@ pub enum NodeObject<'repo> {
     },
 }
 
-impl<'repo> NodeObject<'repo> {
+impl NodeObject<'_> {
     fn get_oid(&self) -> NonZeroOid {
         match self {
             NodeObject::Commit { commit } => commit.get_oid(),
@@ -214,7 +214,7 @@ impl<'a> CommitMessageDescriptor<'a> {
     }
 }
 
-impl<'a> NodeDescriptor for CommitMessageDescriptor<'a> {
+impl NodeDescriptor for CommitMessageDescriptor<'_> {
     #[instrument]
     fn describe_node(
         &mut self,
@@ -249,7 +249,7 @@ impl<'a> ObsolescenceExplanationDescriptor<'a> {
     }
 }
 
-impl<'a> NodeDescriptor for ObsolescenceExplanationDescriptor<'a> {
+impl NodeDescriptor for ObsolescenceExplanationDescriptor<'_> {
     fn describe_node(
         &mut self,
         _glyphs: &Glyphs,
@@ -317,7 +317,7 @@ impl<'a> BranchesDescriptor<'a> {
     }
 }
 
-impl<'a> NodeDescriptor for BranchesDescriptor<'a> {
+impl NodeDescriptor for BranchesDescriptor<'_> {
     #[instrument]
     fn describe_node(
         &mut self,
@@ -412,7 +412,7 @@ $",
     Some(diff_number.to_owned())
 }
 
-impl<'a> NodeDescriptor for DifferentialRevisionDescriptor<'a> {
+impl NodeDescriptor for DifferentialRevisionDescriptor<'_> {
     #[instrument]
     fn describe_node(
         &mut self,

diff --git a/git-branchless-lib/src/core/rewrite/evolve.rs b/git-branchless-lib/src/core/rewrite/evolve.rs
@@ -18,11 +18,7 @@ pub fn find_rewrite_target(
     event_cursor: EventCursor,
     oid: NonZeroOid,
 ) -> Option<MaybeZeroOid> {
-    let event = event_replayer.get_cursor_commit_latest_event(event_cursor, oid);
-    let event = match event {
-        Some(event) => event,
-        None => return None,
-    };
+    let event = event_replayer.get_cursor_commit_latest_event(event_cursor, oid)?;
     match event {
         Event::RewriteEvent {
             timestamp: _,

diff --git a/git-branchless-lib/src/core/task.rs b/git-branchless-lib/src/core/task.rs
@@ -86,7 +86,7 @@ pub struct ResourceHandle<'pool, R: Resource> {
     inner: Option<R::Output>,
 }
 
-impl<'a, R: Resource> Drop for ResourceHandle<'a, R> {
+impl<R: Resource> Drop for ResourceHandle<'_, R> {
     fn drop(&mut self) {
         let mut resources = self
             .parent
@@ -97,7 +97,7 @@ impl<'a, R: Resource> Drop for ResourceHandle<'a, R> {
     }
 }
 
-impl<'a, R: Resource> Deref for ResourceHandle<'a, R> {
+impl<R: Resource> Deref for ResourceHandle<'_, R> {
     type Target = R::Output;
 
     fn deref(&self) -> &Self::Target {

diff --git a/git-branchless-lib/src/git/object.rs b/git-branchless-lib/src/git/object.rs
@@ -319,7 +319,7 @@ pub struct Blob<'repo> {
     pub(super) inner: git2::Blob<'repo>,
 }
 
-impl<'repo> Blob<'repo> {
+impl Blob<'_> {
     /// Get the size of the blob in bytes.
     pub fn size(&self) -> u64 {
         self.inner.size().try_into().unwrap()

diff --git a/git-branchless-lib/src/git/repo.rs b/git-branchless-lib/src/git/repo.rs
@@ -449,7 +449,7 @@ pub enum AmendFastOptions<'repo> {
     },
 }
 
-impl<'repo> AmendFastOptions<'repo> {
+impl AmendFastOptions<'_> {
     /// Returns whether there are any paths to be amended.
     pub fn is_empty(&self) -> bool {
         match &self {

diff --git a/git-branchless-test/src/lib.rs b/git-branchless-test/src/lib.rs
@@ -1164,7 +1164,7 @@ struct SearchGraph<'a> {
     commit_set: CommitSet,
 }
 
-impl<'a> BasicSourceControlGraph for SearchGraph<'a> {
+impl BasicSourceControlGraph for SearchGraph<'_> {
     type Node = NonZeroOid;
     type Error = SearchGraphError;
 

diff --git a/scm-bisect/src/search.rs b/scm-bisect/src/search.rs
@@ -265,7 +265,7 @@ impl<G: Graph> Search<G> {
         &'a self,
         strategy: &'a S,
     ) -> Result<
-        LazySolution<G::Node, SearchError<G::Node, G::Error, S::Error>>,
+        LazySolution<'a, G::Node, SearchError<G::Node, G::Error, S::Error>>,
         SearchError<G::Node, G::Error, S::Error>,
     > {
         let success_bounds = self.success_bounds().map_err(SearchError::Graph)?;
@@ -284,7 +284,7 @@ impl<G: Graph> Search<G> {
             states: VecDeque<State<G>>,
         }
 
-        impl<'a, G: Graph, S: Strategy<G>> Iterator for Iter<'a, G, S> {
+        impl<G: Graph, S: Strategy<G>> Iterator for Iter<'_, G, S> {
             type Item = Result<G::Node, SearchError<G::Node, G::Error, S::Error>>;
 
             fn next(&mut self) -> Option<Self::Item> {