milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Remove unnecessary closure 

Clippy emits:

  warning: unnecessary closure used to substitute value for
  `Option::None`

As suggested, use `ok_or` removing the unnecessary closure.
This commit is contained in:
Tobin C. Harding 2022-05-25 13:28:31 +10:00
parent dfff85352a
commit c75189841a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/blockdata/witness.rs
View File

@ -67,12 +67,12 @@ impl Decodable for Witness {
let element_size = element_size_varint.0 as usize; let element_size = element_size_varint.0 as usize;
let required_len = cursor let required_len = cursor
.checked_add(element_size) .checked_add(element_size)
.ok_or_else(|| self::Error::OversizedVectorAllocation { .ok_or(self::Error::OversizedVectorAllocation {
requested: usize::max_value(), requested: usize::max_value(),
max: MAX_VEC_SIZE, max: MAX_VEC_SIZE,
})? })?
.checked_add(element_size_varint_len) .checked_add(element_size_varint_len)
.ok_or_else(|| self::Error::OversizedVectorAllocation { .ok_or(self::Error::OversizedVectorAllocation {
requested: usize::max_value(), requested: usize::max_value(),
max: MAX_VEC_SIZE, max: MAX_VEC_SIZE,
})?; })?;

6
src/util/sighash.rs
View File

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