diff --git a/Cargo.toml b/Cargo.toml index ced73d14..1557e0f2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,6 +12,7 @@ members = [ "actix-tls", "actix-utils", "router", + "string", ] [patch.crates-io] @@ -27,3 +28,4 @@ actix-threadpool = { path = "actix-threadpool" } actix-tls = { path = "actix-tls" } actix-utils = { path = "actix-utils" } actix-router = { path = "router" } +bytestring = { path = "string" } diff --git a/actix-codec/Cargo.toml b/actix-codec/Cargo.toml index bd3572b8..d0eb6f0b 100644 --- a/actix-codec/Cargo.toml +++ b/actix-codec/Cargo.toml @@ -21,7 +21,6 @@ path = "src/lib.rs" bitflags = "1.2.1" bytes = "0.5.2" futures = "0.3.1" -pin-project = "0.4.6" -tokio = { version = "0.2.2", default-features=false } +tokio = { version = "0.2.3", default-features=false } tokio-util = { version = "0.2.0", default-features=false, features=["codec"] } log = "0.4" \ No newline at end of file diff --git a/actix-codec/src/framed.rs b/actix-codec/src/framed.rs index a82863d6..f4be2792 100644 --- a/actix-codec/src/framed.rs +++ b/actix-codec/src/framed.rs @@ -4,7 +4,6 @@ use std::{fmt, io}; use bytes::{BufMut, BytesMut}; use futures::{ready, Sink, Stream}; -use pin_project::pin_project; use crate::{AsyncRead, AsyncWrite, Decoder, Encoder}; @@ -22,7 +21,6 @@ bitflags::bitflags! { /// the `Encoder` and `Decoder` traits to encode and decode frames. /// /// You can create a `Framed` instance by using the `AsyncRead::framed` adapter. -#[pin_project] pub struct Framed { io: T, codec: U, @@ -31,6 +29,8 @@ pub struct Framed { write_buf: BytesMut, } +impl Unpin for Framed {} + impl Framed where T: AsyncRead + AsyncWrite, diff --git a/actix-connect/CHANGES.md b/actix-connect/CHANGES.md index 08bda7ce..953eb13a 100644 --- a/actix-connect/CHANGES.md +++ b/actix-connect/CHANGES.md @@ -1,10 +1,11 @@ # Changes -## [1.0.0-alpha.3] - 2019-12-xx +## [1.0.0-alpha.3] - 2019-12-07 ### Changed -* Migrate to `tokio=0.2.2` +* Migrate to tokio 0.2 + ## [1.0.0-alpha.2] - 2019-12-02 diff --git a/actix-connect/Cargo.toml b/actix-connect/Cargo.toml index 52e11e94..b72afcbb 100644 --- a/actix-connect/Cargo.toml +++ b/actix-connect/Cargo.toml @@ -42,8 +42,7 @@ either = "1.5.2" futures = "0.3.1" http = { version = "0.2.0", optional = true } log = "0.4" -# trust-dns-resolver = { version="0.18.0", default-features = false } -trust-dns-resolver = { git = "https://github.com/bluejekyll/trust-dns.git" } +trust-dns-resolver = { version="0.18.0-alpha.2", default-features = false, features=["tokio"] } # openssl open-ssl = { version="0.10", package = "openssl", optional = true } diff --git a/actix-ioframe/CHANGES.md b/actix-ioframe/CHANGES.md index 67c63f59..28fb886d 100644 --- a/actix-ioframe/CHANGES.md +++ b/actix-ioframe/CHANGES.md @@ -1,8 +1,8 @@ # Changes -## [0.3.0-alpha.3] - 2019-12-xx +## [0.3.0-alpha.3] - 2019-12-07 -* Migrate to `tokio=0.2.2` +* Migrate to tokio 0.2 ## [0.3.0-alpha.2] - 2019-12-02 diff --git a/actix-rt/CHANGES.md b/actix-rt/CHANGES.md index 23aba775..84ffa768 100644 --- a/actix-rt/CHANGES.md +++ b/actix-rt/CHANGES.md @@ -1,6 +1,6 @@ # Changes -## [1.0.0-alpha.3] - 2019-12-xx +## [1.0.0-alpha.3] - 2019-12-07 ### Fixed @@ -8,7 +8,7 @@ ### Changed -* Migrate to `tokio=0.2.2` +* Migrate to tokio 0.2 ## [1.0.0-alpha.2] - 2019-12-02 diff --git a/actix-rt/Cargo.toml b/actix-rt/Cargo.toml index e1e59907..c6c473b3 100644 --- a/actix-rt/Cargo.toml +++ b/actix-rt/Cargo.toml @@ -22,4 +22,4 @@ actix-macros = "0.1.0-alpha.1" actix-threadpool = "0.3" futures = "0.3.1" copyless = "0.1.4" -tokio = { version = "0.2.2", default-features=false, features = ["rt-core", "rt-util", "io-driver", "tcp", "uds", "udp", "time", "signal", "stream"] } +tokio = { version = "0.2.3", default-features=false, features = ["rt-core", "rt-util", "io-driver", "tcp", "uds", "udp", "time", "signal", "stream"] } diff --git a/actix-server/CHANGES.md b/actix-server/CHANGES.md index de1e9da1..64f8a197 100644 --- a/actix-server/CHANGES.md +++ b/actix-server/CHANGES.md @@ -1,10 +1,10 @@ # Changes -## [1.0.0-alpha.3] - 2019-12-xx +## [1.0.0-alpha.3] - 2019-12-07 ### Changed -* Migrate to `tokio=0.2.2` +* Migrate to tokio 0.2 ### Fixed diff --git a/actix-server/tests/test_server.rs b/actix-server/tests/test_server.rs index b84b0396..f8629a2b 100644 --- a/actix-server/tests/test_server.rs +++ b/actix-server/tests/test_server.rs @@ -76,11 +76,10 @@ fn test_start() { let addr = unused_addr(); let (tx, rx) = mpsc::channel(); - let _ = thread::spawn(move || { + let h = thread::spawn(move || { let sys = actix_rt::System::new("test"); let srv: Server = Server::build() .backlog(100) - .workers(1) .disable_signals() .bind("test", addr, move || { service_fn(|io: TcpStream| { @@ -132,7 +131,7 @@ fn test_start() { thread::sleep(time::Duration::from_millis(100)); let _ = sys.stop(); - // let _ = h.join(); + let _ = h.join(); } #[test] diff --git a/actix-service/CHANGES.md b/actix-service/CHANGES.md index 27cbbabb..9af9cfdf 100644 --- a/actix-service/CHANGES.md +++ b/actix-service/CHANGES.md @@ -1,6 +1,6 @@ # Changes -## [1.0.0-alpha.3] - 2019-12-xx +## [1.0.0-alpha.3] - 2019-12-06 ### Changed diff --git a/actix-service/src/then.rs b/actix-service/src/then.rs index eaf2da5e..7cd59870 100644 --- a/actix-service/src/then.rs +++ b/actix-service/src/then.rs @@ -81,7 +81,7 @@ where { A(#[pin] A::Future, Option>), B(#[pin] B::Future), - Empty + Empty, } impl Future for ThenServiceResponse @@ -111,7 +111,7 @@ where this.state.set(State::Empty); r }), - State::Empty => panic!("future must not be polled after it returned `Poll::Ready`") + State::Empty => panic!("future must not be polled after it returned `Poll::Ready`"), } } } diff --git a/actix-testing/CHANGES.md b/actix-testing/CHANGES.md index 7156fb55..28ff8e3e 100644 --- a/actix-testing/CHANGES.md +++ b/actix-testing/CHANGES.md @@ -1,8 +1,8 @@ # Changes -## [1.0.0-alpha.3] - 2019-12-xx +## [1.0.0-alpha.3] - 2019-12-07 -* Migrate to `tokio=0.2.2` +* Migrate to tokio 0.2 ## [1.0.0-alpha.2] - 2019-12-02 diff --git a/actix-tls/CHANGES.md b/actix-tls/CHANGES.md index 6905a3fe..f9494953 100644 --- a/actix-tls/CHANGES.md +++ b/actix-tls/CHANGES.md @@ -1,10 +1,10 @@ # Changes -[1.0.0-alpha.3] - 2019-12-xx +[1.0.0-alpha.3] - 2019-12-07 ### Changed -* Migrate to `tokio=0.2.2` +* Migrate to tokio 0.2 * Enable rustls acceptor service diff --git a/actix-utils/CHANGES.md b/actix-utils/CHANGES.md index 2766ef05..a91cf9f1 100644 --- a/actix-utils/CHANGES.md +++ b/actix-utils/CHANGES.md @@ -1,8 +1,8 @@ # Changes -## [1.0.0-alpha.3] - 2019-12-xx +## [1.0.0-alpha.3] - 2019-12-07 -* Migrate to `tokio=0.2.2` +* Migrate to tokio 0.2 * Fix oneshot diff --git a/actix-utils/src/timeout.rs b/actix-utils/src/timeout.rs index 1ffb6956..4ea088f8 100644 --- a/actix-utils/src/timeout.rs +++ b/actix-utils/src/timeout.rs @@ -216,7 +216,7 @@ mod tests { #[actix_rt::test] async fn test_timeout() { let resolution = Duration::from_millis(100); - let wait_time = Duration::from_millis(150); + let wait_time = Duration::from_millis(500); let mut timeout = TimeoutService::new(resolution, SleepService(wait_time)); assert_eq!(timeout.call(()).await, Err(TimeoutError::Timeout)); @@ -225,7 +225,7 @@ mod tests { #[actix_rt::test] async fn test_timeout_newservice() { let resolution = Duration::from_millis(100); - let wait_time = Duration::from_millis(150); + let wait_time = Duration::from_millis(500); let timeout = apply( Timeout::new(resolution), diff --git a/router/CHANGES.txt b/router/CHANGES.txt index b0c52bf0..b265a152 100644 --- a/router/CHANGES.txt +++ b/router/CHANGES.txt @@ -1,6 +1,6 @@ # Changes -## [0.2.0] - 2019-12-05 +## [0.2.0] - 2019-12-07 * Update http to 0.2