From 62458f5caff5ba2490f658205e2eb724262ead5e Mon Sep 17 00:00:00 2001 From: fakeshadow <24548779@qq.com> Date: Fri, 5 Feb 2021 19:51:23 -0800 Subject: [PATCH] fix build of actix-server --- actix-server/src/builder.rs | 2 -- actix-server/src/signals.rs | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/actix-server/src/builder.rs b/actix-server/src/builder.rs index 29f6d7b7..7fed6f5e 100644 --- a/actix-server/src/builder.rs +++ b/actix-server/src/builder.rs @@ -505,8 +505,6 @@ impl Future for ServerFuture { if let Poll::Ready(signal) = Pin::new(signals).poll(cx) { this.on_stop_task = this.handle_cmd(ServerCommand::Signal(signal)); this.signals = None; - // poll another round for trying on_stop_task. - return self.poll(cx); } } diff --git a/actix-server/src/signals.rs b/actix-server/src/signals.rs index e11dd972..f49408f3 100644 --- a/actix-server/src/signals.rs +++ b/actix-server/src/signals.rs @@ -2,8 +2,6 @@ use std::future::Future; use std::pin::Pin; use std::task::{Context, Poll}; -use crate::server::Server; - /// Different types of process signals #[allow(dead_code)] #[derive(PartialEq, Clone, Copy, Debug)] @@ -20,7 +18,7 @@ pub(crate) enum Signal { pub(crate) struct Signals { #[cfg(not(unix))] - signals: futures_core::future::LocalBoxFuture<'static, std::io::Result<()>>, + signals: futures_core::future::BoxFuture<'static, std::io::Result<()>>, #[cfg(unix)] signals: Vec<(Signal, actix_rt::signal::unix::Signal)>, }