Skip to content

Commit a3199ca

Browse files
Rust 1.79.0: Update Rust toolchain to stable-2024-06-13
The warnings in slasher::status seem to be the result of 2 changes: - rust-lang/rust#85200 - rust-lang/rust#118297
1 parent 6a7be6f commit a3199ca

File tree

5 files changed

+14
-17
lines changed

5 files changed

+14
-17
lines changed

Cargo.lock

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ absolute_paths_not_starting_with_crate = 'warn'
8787
anonymous_parameters = 'warn'
8888
deprecated_in_future = 'warn'
8989
indirect_structural_match = 'warn'
90-
keyword_idents = 'warn'
9190
let_underscore_drop = 'warn'
9291
macro_use_extern_crate = 'warn'
9392
meta_variable_misuse = 'warn'
@@ -287,7 +286,7 @@ criterion = '0.5.1'
287286
crossbeam-skiplist = '0.1.3'
288287
crossbeam-utils = '0.8.20'
289288
ctr = { version = '0.9.2', features = ['zeroize'] }
290-
darling = '0.20.9'
289+
darling = '0.20.10'
291290
dedicated_executor = { path = 'dedicated_executor' }
292291
delay_map = '0.3.0'
293292
derivative = '2.2.0'

builder_api/src/deneb/containers.rs

-8
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ use types::{
1010
containers::{ExecutionPayload, ExecutionPayloadHeader},
1111
primitives::{Blob, KzgCommitment, KzgProof},
1212
},
13-
nonstandard::Phase,
1413
phase0::primitives::Uint256,
1514
preset::Preset,
1615
};
@@ -31,13 +30,6 @@ pub struct SignedBuilderBid<P: Preset> {
3130
pub signature: SignatureBytes,
3231
}
3332

34-
#[derive(Debug, Deserialize)]
35-
#[serde(bound = "", deny_unknown_fields)]
36-
pub struct GetHeaderResponse<P: Preset> {
37-
pub version: Phase,
38-
pub data: SignedBuilderBid<P>,
39-
}
40-
4133
#[derive(Debug, Deserialize)]
4234
#[serde(bound = "", deny_unknown_fields)]
4335
pub struct BlobsBundle<P: Preset> {

rust-toolchain.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[toolchain]
2-
channel = 'stable-2024-05-02'
2+
channel = 'stable-2024-06-13'
33
profile = 'minimal'
44
components = ['clippy', 'rustfmt']

slasher/src/status.rs

+6
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ pub enum ProposerSlashingReason {
1212
#[derive(Debug)]
1313
pub struct ExplainedProposerSlashing {
1414
pub slashing: ProposerSlashing,
15+
// `ExplainedProposerSlashing.reason` is used for logging through the `Debug` impl.
16+
// Implementing `Display` might be more appropriate but also more verbose.
17+
#[allow(dead_code)]
1518
pub reason: ProposerSlashingReason,
1619
}
1720

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

0 commit comments

Comments
 (0)