diff --git a/actix-server/CHANGES.md b/actix-server/CHANGES.md index 7ec1c1b3..067adcd6 100644 --- a/actix-server/CHANGES.md +++ b/actix-server/CHANGES.md @@ -1,10 +1,12 @@ # Changes -## [Unreleased] +## [1.0.3] - 2020-05-19 ### Changed -* Replace deprecated `net2` crate with `socket2` +* Replace deprecated `net2` crate with `socket2` [#140] + +[#140]: https://github.com/actix/actix-net/pull/140 ## [1.0.2] - 2020-02-26 diff --git a/actix-server/Cargo.toml b/actix-server/Cargo.toml index f6dd8b61..7d584aba 100644 --- a/actix-server/Cargo.toml +++ b/actix-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-server" -version = "1.0.2" +version = "1.0.3" authors = ["Nikolay Kim "] description = "Actix server - General purpose tcp server" keywords = ["network", "framework", "async", "futures"] @@ -9,7 +9,7 @@ repository = "https://github.com/actix/actix-net.git" documentation = "https://docs.rs/actix-server/" categories = ["network-programming", "asynchronous"] license = "MIT/Apache-2.0" -exclude = [".gitignore", ".travis.yml", ".cargo/config", "appveyor.yml"] +exclude = [".gitignore", ".cargo/config"] edition = "2018" workspace = ".." diff --git a/actix-server/src/builder.rs b/actix-server/src/builder.rs index d43657f2..2e8ae30e 100644 --- a/actix-server/src/builder.rs +++ b/actix-server/src/builder.rs @@ -10,7 +10,7 @@ use futures_channel::mpsc::{unbounded, UnboundedReceiver}; use futures_channel::oneshot; use futures_util::future::ready; use futures_util::stream::FuturesUnordered; -use futures_util::{ready, future::Future, FutureExt, stream::Stream, StreamExt}; +use futures_util::{future::Future, ready, stream::Stream, FutureExt, StreamExt}; use log::{error, info}; use socket2::{Domain, Protocol, Socket, Type}; @@ -381,7 +381,7 @@ impl ServerBuilder { .await; System::current().stop(); } - .boxed(), + .boxed(), ); } ready(()) diff --git a/actix-server/src/worker.rs b/actix-server/src/worker.rs index 820a79bf..4ae3e4f3 100644 --- a/actix-server/src/worker.rs +++ b/actix-server/src/worker.rs @@ -10,7 +10,7 @@ use actix_utils::counter::Counter; use futures_channel::mpsc::{unbounded, UnboundedReceiver, UnboundedSender}; use futures_channel::oneshot; use futures_util::future::{join_all, LocalBoxFuture, MapOk}; -use futures_util::{future::Future, FutureExt, stream::Stream, TryFutureExt}; +use futures_util::{future::Future, stream::Stream, FutureExt, TryFutureExt}; use log::{error, info, trace}; use crate::accept::AcceptNotify; diff --git a/actix-server/tests/test_server.rs b/actix-server/tests/test_server.rs index 0e9f7b6d..ce309c94 100644 --- a/actix-server/tests/test_server.rs +++ b/actix-server/tests/test_server.rs @@ -83,12 +83,10 @@ fn test_start() { .backlog(100) .disable_signals() .bind("test", addr, move || { - fn_service(|io: TcpStream| { - async move { - let mut f = Framed::new(io, BytesCodec); - f.send(Bytes::from_static(b"test")).await.unwrap(); - Ok::<_, ()>(()) - } + fn_service(|io: TcpStream| async move { + let mut f = Framed::new(io, BytesCodec); + f.send(Bytes::from_static(b"test")).await.unwrap(); + Ok::<_, ()>(()) }) }) .unwrap()