mirror of
https://github.com/sigp/lighthouse.git
synced 2026-06-29 10:54:24 +00:00
Fix new clippy lints (#2036)
## Issue Addressed NA ## Proposed Changes Fixes new clippy lints in the whole project (mainly [manual_strip](https://rust-lang.github.io/rust-clippy/master/index.html#manual_strip) and [unnecessary_lazy_evaluations](https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_lazy_evaluations)). Furthermore, removes `to_string()` calls on literals when used with the `?`-operator.
This commit is contained in:
@@ -170,7 +170,7 @@ impl<N: Unsigned + Clone> Bitfield<Variable<N>> {
|
||||
|
||||
let len = initial_bitfield
|
||||
.highest_set_bit()
|
||||
.ok_or_else(|| Error::MissingLengthInformation)?;
|
||||
.ok_or(Error::MissingLengthInformation)?;
|
||||
|
||||
// The length bit should be in the last byte, or else it means we have too many bytes.
|
||||
if len / 8 + 1 != bytes_len {
|
||||
@@ -286,7 +286,7 @@ impl<T: BitfieldBehaviour> Bitfield<T> {
|
||||
let byte = self
|
||||
.bytes
|
||||
.get_mut(i / 8)
|
||||
.ok_or_else(|| Error::OutOfBounds { i, len })?;
|
||||
.ok_or(Error::OutOfBounds { i, len })?;
|
||||
|
||||
if value {
|
||||
*byte |= 1 << (i % 8)
|
||||
@@ -308,7 +308,7 @@ impl<T: BitfieldBehaviour> Bitfield<T> {
|
||||
let byte = self
|
||||
.bytes
|
||||
.get(i / 8)
|
||||
.ok_or_else(|| Error::OutOfBounds { i, len: self.len })?;
|
||||
.ok_or(Error::OutOfBounds { i, len: self.len })?;
|
||||
|
||||
Ok(*byte & 1 << (i % 8) > 0)
|
||||
} else {
|
||||
|
||||
@@ -236,7 +236,7 @@ where
|
||||
let num_items = bytes
|
||||
.len()
|
||||
.checked_div(T::ssz_fixed_len())
|
||||
.ok_or_else(|| ssz::DecodeError::ZeroLengthItem)?;
|
||||
.ok_or(ssz::DecodeError::ZeroLengthItem)?;
|
||||
|
||||
if num_items != fixed_len {
|
||||
return Err(ssz::DecodeError::BytesInvalid(format!(
|
||||
|
||||
@@ -236,7 +236,7 @@ where
|
||||
let num_items = bytes
|
||||
.len()
|
||||
.checked_div(T::ssz_fixed_len())
|
||||
.ok_or_else(|| ssz::DecodeError::ZeroLengthItem)?;
|
||||
.ok_or(ssz::DecodeError::ZeroLengthItem)?;
|
||||
|
||||
if num_items > max_len {
|
||||
return Err(ssz::DecodeError::BytesInvalid(format!(
|
||||
|
||||
Reference in New Issue
Block a user