jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: replace futures_util pin and tokio_pin with std pin (#8109)

Browse Source
This commit is contained in:
jn
2024-05-06 03:14:54 -07:00
committed by GitHub
parent 199503531c
commit 8f8b29b3ce
8 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crates/cli/runner/Cargo.toml
View File

@ -15,7 +15,6 @@ workspace = true
reth-tasks.workspace = true
# async
futures.workspace = true
tokio = { workspace = true, features = ["macros", "rt-multi-thread", "signal"] }
# misc

12
crates/cli/runner/src/lib.rs
View File

@ -10,9 +10,8 @@
//! Entrypoint for running commands.
use futures::pin_mut;
use reth_tasks::{TaskExecutor, TaskManager};
use std::future::Future;
use std::{future::Future, pin::pin};
use tracing::{debug, error, trace};
/// Executes CLI commands.
@ -141,7 +140,7 @@ where
E: Send + Sync + From<reth_tasks::PanickedTaskError> + 'static,
{
{
pin_mut!(fut);
let fut = pin!(fut);
tokio::select! {
err = tasks => {
return Err(err.into())
@ -166,7 +165,9 @@ where
{
let mut stream = tokio::signal::unix::signal(tokio::signal::unix::SignalKind::terminate())?;
let sigterm = stream.recv();
pin_mut!(sigterm, ctrl_c, fut);
let sigterm = pin!(sigterm);
let ctrl_c = pin!(ctrl_c);
let fut = pin!(fut);
tokio::select! {
_ = ctrl_c => {
@ -181,7 +182,8 @@ where
#[cfg(not(unix))]
{
pin_mut!(ctrl_c, fut);
let ctrl_c = pin!(ctrl_c);
let fut = pin!(fut);
tokio::select! {
_ = ctrl_c => {