Update Rust Edition to 2024 (#7766)

* #7749

Thanks @dknopik and @michaelsproul for your help!
This commit is contained in:
chonghe
2025-08-13 11:04:31 +08:00
committed by GitHub
parent bd6b8b6a65
commit 522bd9e9c6
468 changed files with 3594 additions and 3396 deletions

View File

@@ -9,10 +9,10 @@
use eth2_config::Eth2Config;
use eth2_network_config::Eth2NetworkConfig;
use futures::channel::mpsc::{channel, Receiver, Sender};
use futures::{future, StreamExt};
use logging::tracing_logging_layer::LoggingLayer;
use futures::channel::mpsc::{Receiver, Sender, channel};
use futures::{StreamExt, future};
use logging::SSELoggingComponents;
use logging::tracing_logging_layer::LoggingLayer;
use logroller::{Compression, LogRollerBuilder, Rotation, RotationSize};
use serde::{Deserialize, Serialize};
use std::path::PathBuf;
@@ -27,7 +27,7 @@ use types::{EthSpec, GnosisEthSpec, MainnetEthSpec, MinimalEthSpec};
use {
futures::Future,
std::{pin::Pin, task::Context, task::Poll},
tokio::signal::unix::{signal, Signal, SignalKind},
tokio::signal::unix::{Signal, SignalKind, signal},
};
#[cfg(not(target_family = "unix"))]

View File

@@ -2,7 +2,7 @@ use crate::{EnvironmentBuilder, LoggerConfig};
use clap::ArgMatches;
use logging::Libp2pDiscv5TracingLayer;
use logging::{
create_libp2p_discv5_tracing_layer, tracing_logging_layer::LoggingLayer, SSELoggingComponents,
SSELoggingComponents, create_libp2p_discv5_tracing_layer, tracing_logging_layer::LoggingLayer,
};
use std::process;

View File

@@ -1,7 +1,7 @@
#![cfg(test)]
use environment::EnvironmentBuilder;
use eth2_network_config::{Eth2NetworkConfig, DEFAULT_HARDCODED_NETWORK};
use eth2_network_config::{DEFAULT_HARDCODED_NETWORK, Eth2NetworkConfig};
use std::path::PathBuf;
use types::{Config, MainnetEthSpec};