Skip to content

Commit

Permalink
Rust 1.79.0: Update Rust toolchain to stable-2024-06-13
Browse files Browse the repository at this point in the history
The warnings in slasher::status seem to be the result of 2 changes:
- rust-lang/rust#85200
- rust-lang/rust#118297
  • Loading branch information
weekday-grandine-io committed Sep 5, 2024
1 parent 6a7be6f commit a3199ca
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 17 deletions.
12 changes: 6 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ absolute_paths_not_starting_with_crate = 'warn'
anonymous_parameters = 'warn'
deprecated_in_future = 'warn'
indirect_structural_match = 'warn'
keyword_idents = 'warn'
let_underscore_drop = 'warn'
macro_use_extern_crate = 'warn'
meta_variable_misuse = 'warn'
Expand Down Expand Up @@ -287,7 +286,7 @@ criterion = '0.5.1'
crossbeam-skiplist = '0.1.3'
crossbeam-utils = '0.8.20'
ctr = { version = '0.9.2', features = ['zeroize'] }
darling = '0.20.9'
darling = '0.20.10'
dedicated_executor = { path = 'dedicated_executor' }
delay_map = '0.3.0'
derivative = '2.2.0'
Expand Down
8 changes: 0 additions & 8 deletions builder_api/src/deneb/containers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ use types::{
containers::{ExecutionPayload, ExecutionPayloadHeader},
primitives::{Blob, KzgCommitment, KzgProof},
},
nonstandard::Phase,
phase0::primitives::Uint256,
preset::Preset,
};
Expand All @@ -31,13 +30,6 @@ pub struct SignedBuilderBid<P: Preset> {
pub signature: SignatureBytes,
}

#[derive(Debug, Deserialize)]
#[serde(bound = "", deny_unknown_fields)]
pub struct GetHeaderResponse<P: Preset> {
pub version: Phase,
pub data: SignedBuilderBid<P>,
}

#[derive(Debug, Deserialize)]
#[serde(bound = "", deny_unknown_fields)]
pub struct BlobsBundle<P: Preset> {
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = 'stable-2024-05-02'
channel = 'stable-2024-06-13'
profile = 'minimal'
components = ['clippy', 'rustfmt']
6 changes: 6 additions & 0 deletions slasher/src/status.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ pub enum ProposerSlashingReason {
#[derive(Debug)]
pub struct ExplainedProposerSlashing {
pub slashing: ProposerSlashing,
// `ExplainedProposerSlashing.reason` is used for logging through the `Debug` impl.
// Implementing `Display` might be more appropriate but also more verbose.
#[allow(dead_code)]
pub reason: ProposerSlashingReason,
}

Expand All @@ -26,5 +29,8 @@ pub enum AttesterSlashingReason {
#[derive(Debug)]
pub struct ExplainedAttesterSlashing<P: Preset> {
pub slashing: AttesterSlashing<P>,
// `ExplainedAttesterSlashing.reason` is used for logging through the `Debug` impl.
// Implementing `Display` might be more appropriate but also more verbose.
#[allow(dead_code)]
pub reason: AttesterSlashingReason,
}

0 comments on commit a3199ca

Please sign in to comment.