actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2024-11-24 03:42:59 +01:00
Code Issues Releases Wiki Activity

Merge pull request #142 from JohnTitor/new-server

Browse Source 
server: Bump up to 1.0.3
This commit is contained in:
Yuki Okushi 2020-05-19 13:58:39 +09:00 committed by GitHub
commit 2d2b0591a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
actix-server/CHANGES.md
View File

@ -1,10 +1,12 @@
# Changes # Changes
## [Unreleased] ## [1.0.3] - 2020-05-19
### Changed ### 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 ## [1.0.2] - 2020-02-26

4
actix-server/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "actix-server" name = "actix-server"
version = "1.0.2" version = "1.0.3"
authors = ["Nikolay Kim <fafhrd91@gmail.com>"] authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
description = "Actix server - General purpose tcp server" description = "Actix server - General purpose tcp server"
keywords = ["network", "framework", "async", "futures"] keywords = ["network", "framework", "async", "futures"]
@ -9,7 +9,7 @@ repository = "https://github.com/actix/actix-net.git"
documentation = "https://docs.rs/actix-server/" documentation = "https://docs.rs/actix-server/"
categories = ["network-programming", "asynchronous"] categories = ["network-programming", "asynchronous"]
license = "MIT/Apache-2.0" license = "MIT/Apache-2.0"
exclude = [".gitignore", ".travis.yml", ".cargo/config", "appveyor.yml"] exclude = [".gitignore", ".cargo/config"]
edition = "2018" edition = "2018"
workspace = ".." workspace = ".."

4
actix-server/src/builder.rs
View File

@ -10,7 +10,7 @@ use futures_channel::mpsc::{unbounded, UnboundedReceiver};
use futures_channel::oneshot; use futures_channel::oneshot;
use futures_util::future::ready; use futures_util::future::ready;
use futures_util::stream::FuturesUnordered; 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 log::{error, info};
use socket2::{Domain, Protocol, Socket, Type}; use socket2::{Domain, Protocol, Socket, Type};
@ -381,7 +381,7 @@ impl ServerBuilder {
.await; .await;
System::current().stop(); System::current().stop();
} }
.boxed(), .boxed(),
); );
} }
ready(()) ready(())

2
actix-server/src/worker.rs
View File

@ -10,7 +10,7 @@ use actix_utils::counter::Counter;
use futures_channel::mpsc::{unbounded, UnboundedReceiver, UnboundedSender}; use futures_channel::mpsc::{unbounded, UnboundedReceiver, UnboundedSender};
use futures_channel::oneshot; use futures_channel::oneshot;
use futures_util::future::{join_all, LocalBoxFuture, MapOk}; 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 log::{error, info, trace};
use crate::accept::AcceptNotify; use crate::accept::AcceptNotify;

10
actix-server/tests/test_server.rs
View File

@ -83,12 +83,10 @@ fn test_start() {
.backlog(100) .backlog(100)
.disable_signals() .disable_signals()
.bind("test", addr, move || { .bind("test", addr, move || {
fn_service(|io: TcpStream| { fn_service(|io: TcpStream| async move {
async move { let mut f = Framed::new(io, BytesCodec);
let mut f = Framed::new(io, BytesCodec); f.send(Bytes::from_static(b"test")).await.unwrap();
f.send(Bytes::from_static(b"test")).await.unwrap(); Ok::<_, ()>(())
Ok::<_, ()>(())
}
}) })
}) })
.unwrap() .unwrap()