1
0
mirror of https://github.com/fafhrd91/actix-web synced 2025-08-31 17:07:01 +02:00

convert to edition 2018

This commit is contained in:
Nikolay Kim
2018-12-06 14:04:42 -08:00
parent 42a4679635
commit 8fe7ce533c
21 changed files with 103 additions and 136 deletions

View File

@@ -3,6 +3,7 @@ use std::{io, mem, net};
use futures::sync::{mpsc, mpsc::unbounded};
use futures::{Future, Sink, Stream};
use log::{error, info};
use net2::TcpBuilder;
use num_cpus;
@@ -284,7 +285,7 @@ impl Server {
self.services.iter().map(|v| v.clone_factory()).collect();
Arbiter::new(format!("actix-net-worker-{}", idx)).do_send(Execute::new(move || {
Worker::start(rx1, rx2, services, avail, timeout.clone());
Worker::start(rx1, rx2, services, avail, timeout);
Ok::<_, ()>(())
}));
@@ -376,7 +377,7 @@ impl Handler<StopServer> for Server {
}
if !self.workers.is_empty() {
Response::async(rx.into_future().map(|_| ()).map_err(|_| ()))
Response::r#async(rx.into_future().map(|_| ()).map_err(|_| ()))
} else {
// we need to stop system if server was spawned
if self.exit {