Remove unnecessary closure

Clippy emits: warning: unnecessary closure used to substitute value for `Option::None` As suggested, use `ok_or` removing the unnecessary closure.
rust-bitcoin · May 25, 2022 · c751898 · c751898
1 parent dfff853
commit c751898
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/blockdata/witness.rs b/src/blockdata/witness.rs
@@ -67,12 +67,12 @@ impl Decodable for Witness {
                 let element_size = element_size_varint.0 as usize;
                 let required_len = cursor
                     .checked_add(element_size)
-                    .ok_or_else(|| self::Error::OversizedVectorAllocation {
+                    .ok_or(self::Error::OversizedVectorAllocation {
                         requested: usize::max_value(),
                         max: MAX_VEC_SIZE,
                     })?
                     .checked_add(element_size_varint_len)
-                    .ok_or_else(|| self::Error::OversizedVectorAllocation {
+                    .ok_or(self::Error::OversizedVectorAllocation {
                         requested: usize::max_value(),
                         max: MAX_VEC_SIZE,
                     })?;

diff --git a/src/util/sighash.rs b/src/util/sighash.rs
@@ -440,7 +440,7 @@ impl<R: Deref<Target = Transaction>> SighashCache<R> {
                     .tx
                     .input
                     .get(input_index)
-                    .ok_or_else(|| Error::IndexOutOfInputsBounds {
+                    .ok_or(Error::IndexOutOfInputsBounds {
                         index: input_index,
                         inputs_size: self.tx.input.len(),
                     })?;
@@ -473,7 +473,7 @@ impl<R: Deref<Target = Transaction>> SighashCache<R> {
             self.tx
                 .output
                 .get(input_index)
-                .ok_or_else(|| Error::SingleWithoutCorrespondingOutput {
+                .ok_or(Error::SingleWithoutCorrespondingOutput {
                     index: input_index,
                     outputs_size: self.tx.output.len(),
                 })?
@@ -597,7 +597,7 @@ impl<R: Deref<Target = Transaction>> SighashCache<R> {
                     .tx
                     .input
                     .get(input_index)
-                    .ok_or_else(|| Error::IndexOutOfInputsBounds {
+                    .ok_or(Error::IndexOutOfInputsBounds {
                         index: input_index,
                         inputs_size: self.tx.input.len(),
                     })?;