Fix lints for Rust 1.63 (#3459)
## Issue Addressed N/A ## Proposed Changes Fix clippy lints for latest rust version 1.63. I have allowed the [derive_partial_eq_without_eq](https://rust-lang.github.io/rust-clippy/master/index.html#derive_partial_eq_without_eq) lint as satisfying this lint would result in more code that we might not want and I feel it's not required. Happy to fix this lint across lighthouse if required though.
This commit is contained in:
parent
f4ffa9e0b4
commit
71fd0b42f2
1
Makefile
1
Makefile
@ -142,6 +142,7 @@ lint:
|
|||||||
cargo clippy --workspace --tests -- \
|
cargo clippy --workspace --tests -- \
|
||||||
-D clippy::fn_to_numeric_cast_any \
|
-D clippy::fn_to_numeric_cast_any \
|
||||||
-D warnings \
|
-D warnings \
|
||||||
|
-A clippy::derive_partial_eq_without_eq \
|
||||||
-A clippy::from-over-into \
|
-A clippy::from-over-into \
|
||||||
-A clippy::upper-case-acronyms \
|
-A clippy::upper-case-acronyms \
|
||||||
-A clippy::vec-init-then-push
|
-A clippy::vec-init-then-push
|
||||||
|
@ -90,10 +90,10 @@ impl BlockId {
|
|||||||
.map_err(warp_utils::reject::beacon_chain_error)?;
|
.map_err(warp_utils::reject::beacon_chain_error)?;
|
||||||
Ok((*root, execution_optimistic))
|
Ok((*root, execution_optimistic))
|
||||||
} else {
|
} else {
|
||||||
return Err(warp_utils::reject::custom_not_found(format!(
|
Err(warp_utils::reject::custom_not_found(format!(
|
||||||
"beacon block with root {}",
|
"beacon block with root {}",
|
||||||
root
|
root
|
||||||
)));
|
)))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -212,7 +212,7 @@ impl<'a, T: EthSpec, Hot: ItemStore<T>, Cold: ItemStore<T>> RootsIterator<'a, T,
|
|||||||
(Err(BeaconStateError::SlotOutOfBounds), Err(BeaconStateError::SlotOutOfBounds)) => {
|
(Err(BeaconStateError::SlotOutOfBounds), Err(BeaconStateError::SlotOutOfBounds)) => {
|
||||||
// Read a `BeaconState` from the store that has access to prior historical roots.
|
// Read a `BeaconState` from the store that has access to prior historical roots.
|
||||||
if let Some(beacon_state) =
|
if let Some(beacon_state) =
|
||||||
next_historical_root_backtrack_state(&*self.store, &self.beacon_state)
|
next_historical_root_backtrack_state(self.store, &self.beacon_state)
|
||||||
.handle_unavailable()?
|
.handle_unavailable()?
|
||||||
{
|
{
|
||||||
self.beacon_state = Cow::Owned(beacon_state);
|
self.beacon_state = Cow::Owned(beacon_state);
|
||||||
|
@ -54,12 +54,10 @@ fn read_contract_file_from_url(url: Url) -> Result<Value, String> {
|
|||||||
.map_err(|e| format!("Respsonse is not a valid json {:?}", e))?;
|
.map_err(|e| format!("Respsonse is not a valid json {:?}", e))?;
|
||||||
Ok(contract)
|
Ok(contract)
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => Err(format!(
|
||||||
return Err(format!(
|
|
||||||
"No abi file found. Failed to download from github: {:?}",
|
"No abi file found. Failed to download from github: {:?}",
|
||||||
e
|
e
|
||||||
))
|
)),
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -46,7 +46,7 @@ impl Serialize for SensitiveUrl {
|
|||||||
where
|
where
|
||||||
S: Serializer,
|
S: Serializer,
|
||||||
{
|
{
|
||||||
serializer.serialize_str(&self.full.to_string())
|
serializer.serialize_str(self.full.as_ref())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -353,7 +353,7 @@ mod test {
|
|||||||
let vec = vec![0, 2, 4, 6];
|
let vec = vec![0, 2, 4, 6];
|
||||||
let fixed: FixedVector<u64, U4> = FixedVector::from(vec);
|
let fixed: FixedVector<u64, U4> = FixedVector::from(vec);
|
||||||
|
|
||||||
assert_eq!(fixed.get(0), Some(&0));
|
assert_eq!(fixed.first(), Some(&0));
|
||||||
assert_eq!(fixed.get(3), Some(&6));
|
assert_eq!(fixed.get(3), Some(&6));
|
||||||
assert_eq!(fixed.get(4), None);
|
assert_eq!(fixed.get(4), None);
|
||||||
}
|
}
|
||||||
|
@ -335,7 +335,7 @@ mod test {
|
|||||||
let vec = vec![0, 2, 4, 6];
|
let vec = vec![0, 2, 4, 6];
|
||||||
let fixed: VariableList<u64, U4> = VariableList::from(vec);
|
let fixed: VariableList<u64, U4> = VariableList::from(vec);
|
||||||
|
|
||||||
assert_eq!(fixed.get(0), Some(&0));
|
assert_eq!(fixed.first(), Some(&0));
|
||||||
assert_eq!(fixed.get(3), Some(&6));
|
assert_eq!(fixed.get(3), Some(&6));
|
||||||
assert_eq!(fixed.get(4), None);
|
assert_eq!(fixed.get(4), None);
|
||||||
}
|
}
|
||||||
|
@ -15,6 +15,7 @@ struct ExitTest {
|
|||||||
validator_index: u64,
|
validator_index: u64,
|
||||||
exit_epoch: Epoch,
|
exit_epoch: Epoch,
|
||||||
state_epoch: Epoch,
|
state_epoch: Epoch,
|
||||||
|
#[allow(clippy::type_complexity)]
|
||||||
state_modifier: Box<dyn FnOnce(&mut BeaconState<E>)>,
|
state_modifier: Box<dyn FnOnce(&mut BeaconState<E>)>,
|
||||||
#[allow(clippy::type_complexity)]
|
#[allow(clippy::type_complexity)]
|
||||||
block_modifier:
|
block_modifier:
|
||||||
|
Loading…
Reference in New Issue
Block a user